---

yaml --- r: 154703 b: refs/heads/master c: eab6330 h: refs/heads/master i: 154701: b04de97 154699: d1f46da 154695: aa15da0 154687: 08f6d11 v: v3
git-mirror · Jul 1, 2009 · 625eb32 · 625eb32
1 parent c2d4f40
commit 625eb32
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 679be3ba0c493eb66d22c206273729ce50925e85
+refs/heads/master: eab633021c26025b34f36f79f0311d3d99f40ceb
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
@@ -4823,6 +4823,9 @@ static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev,
 
 	netif_device_detach(netdev);
 
+	if (state == pci_channel_io_perm_failure)
+		return PCI_ERS_RESULT_DISCONNECT;
+
 	if (netif_running(netdev))
 		e1000_down(adapter);
 	pci_disable_device(pdev);