---

yaml
---
r: 171071
b: refs/heads/master
c: c166b25
h: refs/heads/master
i:
  171069: aeec56a
  171067: 7ebbf03
  171063: 53dc937
  171055: e43374a
  171039: 8d531f7
  171007: 305b286
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 442464218d93aa0aacc55c3a7ac908ae00abff5f
+refs/heads/master: c166b25a5c02d881b1da15f3afe9dc9e56b206a8

trunk/drivers/net/wireless/iwlwifi/iwl-agn.c

@@ -3256,6 +3256,15 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev)
 		iwl_down(priv);
 	}
 
+	/*
+	 * Make sure device is reset to low power before unloading driver.
+	 * This may be redundant with iwl_down(), but there are paths to
+	 * run iwl_down() without calling apm_ops.stop(), and there are
+	 * paths to avoid running iwl_down() at all before leaving driver.
+	 * This (inexpensive) call *makes sure* device is reset.
+	 */
+	priv->cfg->ops->lib->apm_ops.stop(priv);
+
 	iwl_tt_exit(priv);
 
 	/* make sure we flush any pending irq or

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

@@ -4135,6 +4135,15 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
 		iwl3945_down(priv);
 	}
 
+	/*
+	 * Make sure device is reset to low power before unloading driver.
+	 * This may be redundant with iwl_down(), but there are paths to
+	 * run iwl_down() without calling apm_ops.stop(), and there are
+	 * paths to avoid running iwl_down() at all before leaving driver.
+	 * This (inexpensive) call *makes sure* device is reset.
+	 */
+	priv->cfg->ops->lib->apm_ops.stop(priv);
+
 	/* make sure we flush any pending irq or
 	 * tasklet for the driver
 	 */