diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-03-05 20:24:51 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-03-06 21:16:16 +0100 |
| commit | 2e7eb117586198386e5a06d0bc4279a9d7cbaeb6 (patch) | |
| tree | d7f750276d2fbc84ce06216ef96441dd4fecb0a7 /drivers/net/wireless/iwlwifi/iwl-drv.c | |
| parent | iwlwifi: move firmware request into drv (diff) | |
| download | linux-2e7eb117586198386e5a06d0bc4279a9d7cbaeb6.tar.xz linux-2e7eb117586198386e5a06d0bc4279a9d7cbaeb6.zip | |
iwlwifi: move firmware completion wait
This doesn't belong into the op_mode, it has
to be in the drv stop flow instead.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-drv.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-drv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c index 343f41eb4e4f..1a588f36b591 100644 --- a/drivers/net/wireless/iwlwifi/iwl-drv.c +++ b/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); |