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

Commit 15da5d11 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-for-kalle-2016-03-30' of... 

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
parents 2acd8464 7fdf9663

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

+2 −0
Original line number Diff line number Diff line
@@ -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 */

	iwl_mvm_del_aux_sta(mvm);



	iwl_free_fw_paging(mvm);



	/*

	 * Clear IN_HW_RESTART flag when stopping the hw (as restart_complete()

	 * won't be called in this case).

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

+0 −2
Original line number Diff line number Diff line
@@ -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++)

		kfree(mvm->nvm_sections[i].data);



	iwl_free_fw_paging(mvm);



	iwl_mvm_tof_clean(mvm);



	ieee80211_free_hw(mvm->hw);

drivers/net/wireless/intel/iwlwifi/pcie/trans.c

+2 −2
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ static int iwl_pcie_rsa_race_bug_wa(struct iwl_trans *trans) 
	 */

	val = iwl_read_prph(trans, PREG_AUX_BUS_WPROT_0);

	if (val & (BIT(1) | BIT(17))) {

		IWL_INFO(trans,

		IWL_DEBUG_INFO(trans,

			       "can't access the RSA semaphore it is write protected\n");

		return 0;

	}