2 files changed, 5 insertions, 1 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-rfkill.c b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
index 8f38c24491cd..5980a5621cb8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-rfkill.c
+++ b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
@@ -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);
 
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 0eb4220f035f..dae881e47293 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -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);