diff options
| author | Chaya Rachel Ivgi <chaya.rachel.ivgi@intel.com> | 2016-02-22 10:21:41 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2016-03-02 08:56:58 +0200 |
| commit | fcb6b92a682fe5032fdc31af7f8ed86f1dabb1e2 (patch) | |
| tree | 93b7d6182920c18848f5b091b91d1e42fbb0bb8b /drivers/net/wireless/intel/iwlwifi/mvm/d3.c | |
| parent | 3d2d442236b3f87cf9ff70c4252488ed7c6d5be8 (diff) | |
| download | linux-fcb6b92a682fe5032fdc31af7f8ed86f1dabb1e2.tar.gz linux-fcb6b92a682fe5032fdc31af7f8ed86f1dabb1e2.tar.xz | |
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/d3.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c index cf5e6349301e..c1a313149eed 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c @@ -816,8 +816,7 @@ static int iwl_mvm_switch_to_d3(struct iwl_mvm *mvm) { iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_REGULAR, true); - iwl_trans_stop_device(mvm->trans); - + iwl_mvm_stop_device(mvm); /* * Set the HW restart bit -- this is mostly true as we're * going to load new firmware and reprogram that, though |