---

yaml
---
r: 134031
b: refs/heads/master
c: d552bfb
h: refs/heads/master
i:
  134029: 56d07c8
  134027: def31f9
  134023: 4c79090
  134015: 16e9a00
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90a30a021eec15da64a354656cb66987216361eb
+refs/heads/master: d552bfb65241a35d48e44ddb0d27e0454f579ab4

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

@@ -7722,7 +7722,12 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
 
 	set_bit(STATUS_EXIT_PENDING, &priv->status);
 
-	iwl3945_down(priv);
+	if (priv->mac80211_registered) {
+		ieee80211_unregister_hw(priv->hw);
+		priv->mac80211_registered = 0;
+	} else {
+		iwl3945_down(priv);
+	}
 
 	/* make sure we flush any pending irq or
 	 * tasklet for the driver
@@ -7745,9 +7750,6 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
 	iwl3945_unset_hw_params(priv);
 	iwl3945_clear_stations_table(priv);
 
-	if (priv->mac80211_registered)
-		ieee80211_unregister_hw(priv->hw);
-
 	/*netif_stop_queue(dev); */
 	flush_workqueue(priv->workqueue);