Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04ddc2aa authored by Chaya Rachel Ivgi's avatar Chaya Rachel Ivgi Committed by Emmanuel Grumbach
Browse files

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: default avatarChaya Rachel Ivgi <chaya.rachel.ivgi@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent afd5b170

drivers/net/wireless/intel/iwlwifi/mvm/ops.c

+3 −3
Original line number Diff line number Diff line
@@ -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;