diff options
| author | Chaya Rachel Ivgi | 2016-03-03 12:31:39 +0100 |
|---|---|---|
| committer | Emmanuel Grumbach | 2016-03-07 12:34:15 +0100 |
| commit | 04ddc2aacc1c52793c1e30db5073bef6fbc08942 (patch) | |
| tree | 5ab920bf96df29adeefd5ea3b380b593aba54aa5 /drivers | |
| parent | iwlwifi: refactor the code that reads the MAC address from the NVM (diff) | |
| download | kernel-qcow2-linux-04ddc2aacc1c52793c1e30db5073bef6fbc08942.tar.gz kernel-qcow2-linux-04ddc2aacc1c52793c1e30db5073bef6fbc08942.tar.xz kernel-qcow2-linux-04ddc2aacc1c52793c1e30db5073bef6fbc08942.zip | |
iwlwifi: mvm: fix unregistration of thermal in some error flows
The call to iwl_mvm_thermal_initialize() was too early in the
function.
Unregister will be performed when goto out_unregister is called,
but as the code was - out_free may be called and leave without
unregistering from thermal.
Signed-off-by: Chaya Rachel Ivgi <chaya.rachel.ivgi@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c index 699a80863e86..4322e8ed1159 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c @@ -611,9 +611,6 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, IWL_INFO(mvm, "Detected %s, REV=0x%X\n", mvm->cfg->name, mvm->trans->hw_rev); - min_backoff = calc_min_backoff(trans, cfg); - iwl_mvm_thermal_initialize(mvm, min_backoff); - if (iwlwifi_mod_params.nvm_file) mvm->nvm_file_name = iwlwifi_mod_params.nvm_file; else @@ -666,6 +663,9 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, if (err) goto out_free; + min_backoff = calc_min_backoff(trans, cfg); + iwl_mvm_thermal_initialize(mvm, min_backoff); + err = iwl_mvm_dbgfs_register(mvm, dbgfs_dir); if (err) goto out_unregister; |