diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-23 11:47:48 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-23 11:47:48 -0400 |
| commit | 81ca2ff9450c2e983ee416eca17ebe6fa9c3da4f (patch) | |
| tree | 6e21a27d727481434b58543d8cff960bb7672b53 /drivers/net/wireless/iwlegacy/4965-mac.c | |
| parent | 4a5a8aa6c966eafc106543bd955ae388230420e5 (diff) | |
| parent | 19c361608ce3e73f352e323262f7e0a8264be3af (diff) | |
| download | linux-81ca2ff9450c2e983ee416eca17ebe6fa9c3da4f.tar.gz linux-81ca2ff9450c2e983ee416eca17ebe6fa9c3da4f.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlegacy/4965-mac.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/4965-mac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index f2ed62e37340..7acf5ee23582 100644 --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c @@ -4464,9 +4464,9 @@ il4965_irq_tasklet(struct il_priv *il) set_bit(S_RFKILL, &il->status); } else { clear_bit(S_RFKILL, &il->status); - wiphy_rfkill_set_hw_state(il->hw->wiphy, hw_rf_kill); il_force_reset(il, true); } + wiphy_rfkill_set_hw_state(il->hw->wiphy, hw_rf_kill); handled |= CSR_INT_BIT_RF_KILL; } |