leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iwlwifi: check RF kill register when interrupts have been disabled

Browse Source 
Since the interrupts have been disabled, we may have missed an RF
kill interrupt. Check the register to be sure the op_mode is in
sync.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
This commit is contained in:
Emmanuel Grumbach 2012-03-28 10:34:02 +02:00 committed by Wey-Yi Guy
parent 226c02ca7f
commit d23f78e61f
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
View File

@ -1438,12 +1438,22 @@ error:
static void iwl_trans_pcie_stop_hw(struct iwl_trans *trans)
{
bool hw_rfkill;
iwl_apm_stop(trans);
iwl_write32(trans, CSR_INT, 0xFFFFFFFF);
/* Even if we stop the HW, we still want the RF kill interrupt */
iwl_enable_rfkill_int(trans);
/*
* Check again since the RF kill state may have changed while all the
* interrupts were disabled, in this case we couldn't receive the
* RF kill interrupt and update the state in the op_mode.
*/
hw_rfkill = iwl_is_rfkill_set(trans);
iwl_op_mode_hw_rf_kill(trans->op_mode, hw_rfkill);
}
static void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn,