aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2012-02-14 02:50:42 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-02-22 14:51:17 -0500
commit3976b4519458b27753196e63c89b2a774129e19a (patch)
tree3daf0babac757d02abd8b7f5a237345ba31d5a85
parent71e0c6c267595f406cf0e0699bacf10098e0f387 (diff)
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>
-rw-r--r--drivers/net/wireless/iwlegacy/4965-mac.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index 24a3bbc23eb8..cf1486132eea 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -5523,13 +5523,11 @@ __il4965_up(struct il_priv *il)
5523 /* If platform's RF_KILL switch is NOT set to KILL */ 5523 /* If platform's RF_KILL switch is NOT set to KILL */
5524 if (_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW) 5524 if (_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)
5525 clear_bit(S_RF_KILL_HW, &il->status); 5525 clear_bit(S_RF_KILL_HW, &il->status);
5526 else 5526 else {
5527 set_bit(S_RF_KILL_HW, &il->status); 5527 set_bit(S_RF_KILL_HW, &il->status);
5528
5529 if (il_is_rfkill(il)) {
5530 wiphy_rfkill_set_hw_state(il->hw->wiphy, true); 5528 wiphy_rfkill_set_hw_state(il->hw->wiphy, true);
5531 5529
5532 il_enable_interrupts(il); 5530 il_enable_rfkill_int(il);
5533 IL_WARN("Radio disabled by HW RF Kill switch\n"); 5531 IL_WARN("Radio disabled by HW RF Kill switch\n");
5534 return 0; 5532 return 0;
5535 } 5533 }