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

Commit 59003835 authored by Mohamed Abbas's avatar Mohamed Abbas Committed by John W. Linville
Browse files

iwlwifi: fix unload warning and error 



This patch fix the error we get when unload the driver, No space for Tx.
The cause of this problem is related to receiving late SW rfkill from
rfkill subsystem during the driver teardown causing this error.

Signed-off-by: default avatarMohamed Abbas <mabbas@linux.intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent dfe7d458

drivers/net/wireless/iwlwifi/iwl-rfkill.c

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ static int iwl_rfkill_soft_rf_kill(void *data, enum rfkill_state state) 
	if (!priv->rfkill_mngr.rfkill)

		return 0;



	if (test_bit(STATUS_EXIT_PENDING, &priv->status))

		return 0;



	IWL_DEBUG_RF_KILL("we recieved soft RFKILL set to state %d\n", state);

	mutex_lock(&priv->mutex);

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

+2 −1
Original line number Diff line number Diff line
@@ -2427,7 +2427,8 @@ void iwl4965_radio_kill_sw(struct iwl_priv *priv, int disable_radio) 
				    CSR_UCODE_SW_BIT_RFKILL);

			spin_unlock_irqrestore(&priv->lock, flags);

			/* call the host command only if no hw rf-kill set */

			if (!test_bit(STATUS_RF_KILL_HW, &priv->status))

			if (!test_bit(STATUS_RF_KILL_HW, &priv->status) &&

			    iwl_is_ready(priv))

				iwl4965_send_card_state(priv,

							CARD_STATE_CMD_DISABLE,

							0);