Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53e49093 authored by Zhu Yi's avatar Zhu Yi Committed by John W. Linville
Browse files

iwlwifi: fix rf_kill state inconsistent during suspend and resume 



The patch fixes the STATUS_RF_KILL_HW state is not cleared problem if the
device goes to suspend when the rf_kill switch is enabled. The bug causes
the driver always thinks the rf_kill switch is enabled (although it is
disabled) after resume.

Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1a8d1227

drivers/net/wireless/iwlwifi/iwl3945-base.c

+3 −1
Original line number Diff line number Diff line
@@ -4743,8 +4743,10 @@ static void iwl_irq_tasklet(struct iwl_priv *priv) 
		 *   when we loaded driver, and is now set to "enable".

		 * After we're Alive, RF_KILL gets handled by

		 *   iwl_rx_card_state_notif() */

		if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status))

		if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status)) {

			clear_bit(STATUS_RF_KILL_HW, &priv->status);

			queue_work(priv->workqueue, &priv->restart);

		}



		handled |= CSR_INT_BIT_RF_KILL;

	}

drivers/net/wireless/iwlwifi/iwl4965-base.c

+3 −1
Original line number Diff line number Diff line
@@ -5059,8 +5059,10 @@ static void iwl_irq_tasklet(struct iwl_priv *priv) 
		 *   when we loaded driver, and is now set to "enable".

		 * After we're Alive, RF_KILL gets handled by

		 *   iwl_rx_card_state_notif() */

		if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status))

		if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status)) {

			clear_bit(STATUS_RF_KILL_HW, &priv->status);

			queue_work(priv->workqueue, &priv->restart);

		}



		handled |= CSR_INT_BIT_RF_KILL;

	}