From 1e62e41adc5e20d8228da564429e3bb1363b450e Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Fri, 16 Oct 2009 13:18:54 +0800
Subject: [PATCH] --- yaml --- r: 171011 b: refs/heads/master c:
 f96cca8483c1b0bcc8002dc466159bf8fd53ca47 h: refs/heads/master i:   171009:
 5bd5af5d405a6763ba9a50636a98b747e2dedbdd   171007:
 305b2860826f0469155f3a104af3ace31676c9ca v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/net/wireless/iwmc3200wifi/sdio.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 428996e8abff..c6b816e34fb2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88e6195a911bce85adcc14e8377aa619e8054ab2
+refs/heads/master: f96cca8483c1b0bcc8002dc466159bf8fd53ca47
diff --git a/trunk/drivers/net/wireless/iwmc3200wifi/sdio.c b/trunk/drivers/net/wireless/iwmc3200wifi/sdio.c
index 38026b70a2f9..cf86294f719b 100644
--- a/trunk/drivers/net/wireless/iwmc3200wifi/sdio.c
+++ b/trunk/drivers/net/wireless/iwmc3200wifi/sdio.c
@@ -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;