---

yaml --- r: 75017 b: refs/heads/master c: 8543da6 h: refs/heads/master i: 75015: 1e7cbd6 v: v3
git-mirror · Dec 14, 2007 · f2fde43 · f2fde43
1 parent b0cde0b
commit f2fde43
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 813820b9b9adb98d4ad3cd7434eb662b0fc15684
+refs/heads/master: 8543da6672b0994921f014f2250e27ae81645580
diff --git a/trunk/drivers/net/e100.c b/trunk/drivers/net/e100.c
@@ -2737,8 +2737,9 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
 		pci_enable_wake(pdev, PCI_D3cold, 0);
 	}
 
-	pci_disable_device(pdev);
 	free_irq(pdev->irq, netdev);
+
+	pci_disable_device(pdev);
 	pci_set_power_state(pdev, PCI_D3hot);
 
 	return 0;
@@ -2780,6 +2781,8 @@ static void e100_shutdown(struct pci_dev *pdev)
 		pci_enable_wake(pdev, PCI_D3cold, 0);
 	}
 
+	free_irq(pdev->irq, netdev);
+
 	pci_disable_device(pdev);
 	pci_set_power_state(pdev, PCI_D3hot);
 }