---

yaml
---
r: 40785
b: refs/heads/master
c: edd106f
h: refs/heads/master
i:
  40783: 5c113f2
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e78181feb0b94fb6afeaef3b28d4f5df1b847c98
+refs/heads/master: edd106fc8ac1826dbe231b70ce0762db24133e5c

trunk/drivers/net/e1000/e1000_main.c

@@ -4800,6 +4800,9 @@ e1000_suspend(struct pci_dev *pdev, pm_message_t state)
 	if (adapter->hw.phy_type == e1000_phy_igp_3)
 		e1000_phy_powerdown_workaround(&adapter->hw);
 
+	if (netif_running(netdev))
+		e1000_free_irq(adapter);
+
 	/* Release control of h/w to f/w.  If f/w is AMT enabled, this
 	 * would have already happened in close and is redundant. */
 	e1000_release_hw_control(adapter);
@@ -4830,6 +4833,10 @@ e1000_resume(struct pci_dev *pdev)
 	pci_enable_wake(pdev, PCI_D3hot, 0);
 	pci_enable_wake(pdev, PCI_D3cold, 0);
 
+	if (netif_running(netdev) && (err = e1000_request_irq(adapter)))
+		return err;
+
+	e1000_power_up_phy(adapter);
 	e1000_reset(adapter);
 	E1000_WRITE_REG(&adapter->hw, WUS, ~0);