From 3976b4519458b27753196e63c89b2a774129e19a Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Tue, 14 Feb 2012 08:50:42 +0100 Subject: iwlegacy: enable only rfkill interrupt when rfkill switch is on during IFF_UP Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville --- drivers/net/wireless/iwlegacy/4965-mac.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers/net/wireless/iwlegacy/4965-mac.c') diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index 24a3bbc..cf14861 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) /* 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) clear_bit(S_RF_KILL_HW, &il->status); - else + else { set_bit(S_RF_KILL_HW, &il->status); - - if (il_is_rfkill(il)) { 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"); return 0; } -- cgit v1.1