From eef69e927eefb30a2cbac5355fcaa13f163ae334 Mon Sep 17 00:00:00 2001
From: Dean Nelson <dnelson@redhat.com>
Date: Fri, 31 Jul 2009 09:13:56 +0000
Subject: [PATCH] --- yaml --- r: 159300 b: refs/heads/master c:
 1e3c8bd63854a620680323681f28e60a44e26f0e h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/s2io.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6eba0ead1c21..599901aaa5ee 100644
--- 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
index d4df9330c447..bd6d713c861a 100644
--- 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);