---

yaml --- r: 45956 b: refs/heads/master c: 518d833 h: refs/heads/master v: v3
git-mirror · Jan 30, 2007 · 55b51e6 · 55b51e6
1 parent c557af0
commit 55b51e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8a8ccd56d82bd4f4b5c7c2e7eb758c7764d98e1
+refs/heads/master: 518d83382568964ca9657511140398ebac925ecd
diff --git a/trunk/drivers/net/e100.c b/trunk/drivers/net/e100.c
@@ -2725,6 +2725,7 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
 	del_timer_sync(&nic->watchdog);
 	netif_carrier_off(nic->netdev);
 
+	netif_device_detach(netdev);
 	pci_save_state(pdev);
 
 	if ((nic->flags & wol_magic) | e100_asf(nic)) {
@@ -2736,6 +2737,7 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
 	}
 
 	pci_disable_device(pdev);
+	free_irq(pdev->irq, netdev);
 	pci_set_power_state(pdev, PCI_D3hot);
 
 	return 0;