---

yaml --- r: 35336 b: refs/heads/master c: 72e8d6b h: refs/heads/master v: v3
git-mirror · Sep 19, 2006 · 687dec5 · 687dec5
1 parent 09c296e
commit 687dec5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f50e5ea14baa321c5f0ff71707a83b02bf5b9398
+refs/heads/master: 72e8d6bbc151ca670c66d58a37e5bbfbc041db69
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
@@ -4811,6 +4811,7 @@ static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev, pci_channe
 
 	if (netif_running(netdev))
 		e1000_down(adapter);
+	pci_disable_device(pdev);
 
 	/* Request a slot slot reset. */
 	return PCI_ERS_RESULT_NEED_RESET;