Commit f96cca84 authored Oct 16, 2009 by Samuel Ortiz Committed by John W. Linville Oct 27, 2009

iwmc3200wifi: SDIO disable race fix



When calling sdio->bus_disable(), we are flushing the command lists before
disabling the sdio function. We can thus potentially get a command response
after having flushed the command list.
To avoid that race, we have to call iwm_reset() after disabling the sdio
function.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 88e6195a

drivers/net/wireless/iwmc3200wifi/sdio.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -224,8 +224,6 @@ static int if_sdio_disable(struct iwm_priv *iwm)
		struct iwm_sdio_priv *hw = iwm_to_if_sdio(iwm);
		int ret;

		iwm_reset(iwm);

		sdio_claim_host(hw->func);
		sdio_writeb(hw->func, 0, IWM_SDIO_INTR_ENABLE_ADDR, &ret);
		if (ret < 0)
		@@ -237,6 +235,8 @@ static int if_sdio_disable(struct iwm_priv *iwm)

		iwm_sdio_rx_free(hw);

		iwm_reset(iwm);

		IWM_DBG_SDIO(iwm, INFO, "IWM SDIO disable\n");

		return 0;