diff options
| author | Stanislaw Gruszka | 2013-08-21 10:18:19 +0200 |
|---|---|---|
| committer | John W. Linville | 2013-08-22 17:40:08 +0200 |
| commit | b2fcc0aee58a3435566dd6d8501a0b355552f28b (patch) | |
| tree | ec13e7da6cfc48791bcd5a709295b36a9c60debc /drivers/net/wireless/iwlegacy/4965-mac.c | |
| parent | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber... (diff) | |
| download | kernel-qcow2-linux-b2fcc0aee58a3435566dd6d8501a0b355552f28b.tar.gz kernel-qcow2-linux-b2fcc0aee58a3435566dd6d8501a0b355552f28b.tar.xz kernel-qcow2-linux-b2fcc0aee58a3435566dd6d8501a0b355552f28b.zip | |
iwl4965: fix rfkill set state regression
My current 3.11 fix:
commit 788f7a56fce1bcb2067b62b851a086fca48a0056
Author: Stanislaw Gruszka <sgruszka@redhat.com>
Date: Thu Aug 1 12:07:55 2013 +0200
iwl4965: reset firmware after rfkill off
broke rfkill notification to user-space . I missed that bug, because
I compiled without CONFIG_RFKILL, sorry about that.
Cc: stable@vger.kernel.org
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
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; } |