---

yaml --- r: 159300 b: refs/heads/master c: 1e3c8bd h: refs/heads/master v: v3
git-mirror · Aug 2, 2009 · eef69e9 · eef69e9
1 parent 58971d7
commit eef69e9
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: fbc663ceeb7a48481a3b0290040528fbfd207282
+refs/heads/master: 1e3c8bd63854a620680323681f28e60a44e26f0e
diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c
@@ -8636,6 +8636,9 @@ static pci_ers_result_t s2io_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)) {
 		/* Bring down the card, while avoiding PCI I/O */
 		do_s2io_card_down(sp, 0);