forked from Minki/linux
Merge tag 'iwlwifi-for-kalle-2016-03-30' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
* lower the debug level of a benign print * fix a memory leak
This commit is contained in:
commit
15da5d1104
@ -1147,6 +1147,8 @@ void __iwl_mvm_mac_stop(struct iwl_mvm *mvm)
|
|||||||
/* the fw is stopped, the aux sta is dead: clean up driver state */
|
/* the fw is stopped, the aux sta is dead: clean up driver state */
|
||||||
iwl_mvm_del_aux_sta(mvm);
|
iwl_mvm_del_aux_sta(mvm);
|
||||||
|
|
||||||
|
iwl_free_fw_paging(mvm);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Clear IN_HW_RESTART flag when stopping the hw (as restart_complete()
|
* Clear IN_HW_RESTART flag when stopping the hw (as restart_complete()
|
||||||
* won't be called in this case).
|
* won't be called in this case).
|
||||||
|
@ -761,8 +761,6 @@ static void iwl_op_mode_mvm_stop(struct iwl_op_mode *op_mode)
|
|||||||
for (i = 0; i < NVM_MAX_NUM_SECTIONS; i++)
|
for (i = 0; i < NVM_MAX_NUM_SECTIONS; i++)
|
||||||
kfree(mvm->nvm_sections[i].data);
|
kfree(mvm->nvm_sections[i].data);
|
||||||
|
|
||||||
iwl_free_fw_paging(mvm);
|
|
||||||
|
|
||||||
iwl_mvm_tof_clean(mvm);
|
iwl_mvm_tof_clean(mvm);
|
||||||
|
|
||||||
ieee80211_free_hw(mvm->hw);
|
ieee80211_free_hw(mvm->hw);
|
||||||
|
@ -732,8 +732,8 @@ static int iwl_pcie_rsa_race_bug_wa(struct iwl_trans *trans)
|
|||||||
*/
|
*/
|
||||||
val = iwl_read_prph(trans, PREG_AUX_BUS_WPROT_0);
|
val = iwl_read_prph(trans, PREG_AUX_BUS_WPROT_0);
|
||||||
if (val & (BIT(1) | BIT(17))) {
|
if (val & (BIT(1) | BIT(17))) {
|
||||||
IWL_INFO(trans,
|
IWL_DEBUG_INFO(trans,
|
||||||
"can't access the RSA semaphore it is write protected\n");
|
"can't access the RSA semaphore it is write protected\n");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user