diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 2e20e8e..971ac71 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -6917,10 +6917,13 @@ static void iwl3945_mac_stop(struct ieee80211_hw *hw)
 	iwl3945_down(priv);
 
 	flush_workqueue(priv->workqueue);
-	free_irq(priv->pci_dev->irq, priv);
-	pci_disable_msi(priv->pci_dev);
-	pci_save_state(priv->pci_dev);
-	pci_disable_device(priv->pci_dev);
+
+	if(!test_bit(STATUS_RF_KILL_HW, &priv->status) && !test_bit(STATUS_IN_SUSPEND, &priv->status)) {
+		free_irq(priv->pci_dev->irq, priv);
+		pci_disable_msi(priv->pci_dev);
+		pci_save_state(priv->pci_dev);
+		pci_disable_device(priv->pci_dev);
+	}
 
 	IWL_DEBUG_MAC80211("leave\n");
 }