| From | Ben Hutchings <> | Date | Sun, 08 Sep 2013 03:52:01 +0100 | Subject | [099/121] iwl4965: fix rfkill set state regression |
| |
3.2.51-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Stanislaw Gruszka <sgruszka@redhat.com>
commit b2fcc0aee58a3435566dd6d8501a0b355552f28b upstream.
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.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> [bwh: Backported to 3.2: adjust filename, context, naming] Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- drivers/net/wireless/iwlegacy/iwl4965-base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/net/wireless/iwlegacy/iwl4965-base.c +++ b/drivers/net/wireless/iwlegacy/iwl4965-base.c @@ -872,9 +872,9 @@ static void iwl4965_irq_tasklet(struct i set_bit(STATUS_RF_KILL_HW, &priv->status); } else { clear_bit(STATUS_RF_KILL_HW, &priv->status); - wiphy_rfkill_set_hw_state(priv->hw->wiphy, hw_rf_kill); iwl_legacy_force_reset(priv, true); } + wiphy_rfkill_set_hw_state(priv->hw->wiphy, hw_rf_kill); handled |= CSR_INT_BIT_RF_KILL; }
|