openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

iwlegacy: enable only rfkill interrupt when rfkill switch is on during IFF_UP 

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Stanislaw Gruszka 2012-02-14 08:50:42 +01:00 committed by John W. Linville
parent 71e0c6c267
commit 3976b45194
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/iwlegacy/4965-mac.c
View File

@ -5523,13 +5523,11 @@ __il4965_up(struct il_priv *il)
/* If platform's RF_KILL switch is NOT set to KILL */ /* If platform's RF_KILL switch is NOT set to KILL */
if (_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW) if (_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)
clear_bit(S_RF_KILL_HW, &il->status); clear_bit(S_RF_KILL_HW, &il->status);
else else {
set_bit(S_RF_KILL_HW, &il->status); set_bit(S_RF_KILL_HW, &il->status);
if (il_is_rfkill(il)) {
wiphy_rfkill_set_hw_state(il->hw->wiphy, true); wiphy_rfkill_set_hw_state(il->hw->wiphy, true);
il_enable_interrupts(il); il_enable_rfkill_int(il);
IL_WARN("Radio disabled by HW RF Kill switch\n"); IL_WARN("Radio disabled by HW RF Kill switch\n");
return 0; return 0;
} }