aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
diff options
context:
space:
mode:
authorChaya Rachel Ivgi <chaya.rachel.ivgi@intel.com>2016-02-22 03:21:41 -0500
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2016-03-02 01:56:58 -0500
commitfcb6b92a682fe5032fdc31af7f8ed86f1dabb1e2 (patch)
tree93b7d6182920c18848f5b091b91d1e42fbb0bb8b /drivers/net/wireless/intel/iwlwifi/mvm/ops.c
parent3d2d442236b3f87cf9ff70c4252488ed7c6d5be8 (diff)
iwlwifi: mvm: update ucode status before stopping device
Leaving ucode_loaded to true after stop_device() has been called is a recipe for problems. Flows that are not sync'ed with the driver life cycle (like debugfs hooks and thermal hooks) must check that the firmware is loaded before they interact with it. Therefore we need to keep this variable updated with the real status of the firmware. Signed-off-by: Chaya Rachel Ivgi <chaya.rachel.ivgi@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/ops.c')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/ops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index 8bdaa7b27ab1..4716176cbfe0 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -643,7 +643,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
643 iwl_mvm_ref(mvm, IWL_MVM_REF_INIT_UCODE); 643 iwl_mvm_ref(mvm, IWL_MVM_REF_INIT_UCODE);
644 err = iwl_run_init_mvm_ucode(mvm, true); 644 err = iwl_run_init_mvm_ucode(mvm, true);
645 if (!err || !iwlmvm_mod_params.init_dbg) 645 if (!err || !iwlmvm_mod_params.init_dbg)
646 iwl_trans_stop_device(trans); 646 iwl_mvm_stop_device(mvm);
647 iwl_mvm_unref(mvm, IWL_MVM_REF_INIT_UCODE); 647 iwl_mvm_unref(mvm, IWL_MVM_REF_INIT_UCODE);
648 mutex_unlock(&mvm->mutex); 648 mutex_unlock(&mvm->mutex);
649 /* returns 0 if successful, 1 if success but in rfkill */ 649 /* returns 0 if successful, 1 if success but in rfkill */