From: Dean Nelson <dnelson@redhat.com>
Date: Fri, 31 Jul 2009 09:13:56 +0000 (+0000)
Subject: s2io: return PCI_ERS_RESULT_DISCONNECT on permanent failure
X-Git-Tag: v2.6.32-rc1~703^2~493
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1e3c8bd63854a620680323681f28e60a44e26f0e;p=~shefty%2Frdma-dev.git

s2io: return PCI_ERS_RESULT_DISCONNECT on permanent failure

PCI drivers that implement the struct pci_error_handlers' error_detected
callback should return PCI_ERS_RESULT_DISCONNECT if the state passed in is
pci_channel_io_perm_failure. This patch fixes the issue for s2io.

Signed-off-by: Dean Nelson <dnelson@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index d4df9330c44..bd6d713c861 100644
--- a/drivers/net/s2io.c
+++ b/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);