Commit 2e7eb117 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 15854ef9
...@@ -1371,8 +1371,6 @@ static void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode) ...@@ -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); 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_DEBUG_INFO(priv, "*** UNLOAD DRIVER ***\n");
iwl_dbgfs_unregister(priv); iwl_dbgfs_unregister(priv);
......
...@@ -720,6 +720,8 @@ int iwl_drv_start(struct iwl_shared *shrd, ...@@ -720,6 +720,8 @@ int iwl_drv_start(struct iwl_shared *shrd,
void iwl_drv_stop(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 */ /* op_mode can be NULL if its start failed */
if (shrd->nic->op_mode) if (shrd->nic->op_mode)
iwl_op_mode_stop(shrd->nic->op_mode); iwl_op_mode_stop(shrd->nic->op_mode);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment