From 669eebed844c0bdc191b6ff65e59674347415035 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 5 Mar 2012 11:24:51 -0800
Subject: [PATCH] --- yaml --- r: 291199 b: refs/heads/master c:
 2e7eb117586198386e5a06d0bc4279a9d7cbaeb6 h: refs/heads/master i:   291197:
 17009a8306e1d23f318ccd98e58e58f267297fac   291195:
 0c625d76ee11af7af5af76a06a48dad523c01dcb   291191:
 0994aad2bde25d6a0b22ef88c3b9094ce180d64a   291183:
 ae5c1edae824be1ac33ca50b54844ca1e7181d1f   291167:
 a14c7141beea3869f8cc34d3321c318675050d6b   291135:
 524815ebd4964ebfb07d7f69e25f18d11a20b0c3   291071:
 3645cf7bfd0a15cabc12e89bc4e298322c925cb4 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 2 --
 trunk/drivers/net/wireless/iwlwifi/iwl-drv.c | 2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7dc8153713f3..07690e00bf9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15854ef94f54ae8fa8b95eb66a2cfa5dcff481e9
+refs/heads/master: 2e7eb117586198386e5a06d0bc4279a9d7cbaeb6
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c
index c3b594647def..8bb3f173bfa0 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1371,8 +1371,6 @@ static void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode)
 {
 	struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
 
-	wait_for_completion(&nic(priv)->request_firmware_complete);
-
 	IWL_DEBUG_INFO(priv, "*** UNLOAD DRIVER ***\n");
 
 	iwl_dbgfs_unregister(priv);
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c b/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c
index 343f41eb4e4f..1a588f36b591 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -720,6 +720,8 @@ int iwl_drv_start(struct iwl_shared *shrd,
 
 void iwl_drv_stop(struct iwl_shared *shrd)
 {
+	wait_for_completion(&shrd->nic->request_firmware_complete);
+
 	/* op_mode can be NULL if its start failed */
 	if (shrd->nic->op_mode)
 		iwl_op_mode_stop(shrd->nic->op_mode);