diff options
| author | Dean Nelson <dnelson@redhat.com> | 2009-07-31 13:13:56 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-02 10:12:06 +0400 |
| commit | 1e3c8bd63854a620680323681f28e60a44e26f0e (patch) | |
| tree | 6d152a6878cce5feaeb307f61027942e238a0e8b /drivers/net/s2io.c | |
| parent | fbc663ceeb7a48481a3b0290040528fbfd207282 (diff) | |
| download | linux-1e3c8bd63854a620680323681f28e60a44e26f0e.tar.xz | |
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>
Diffstat (limited to 'drivers/net/s2io.c')
| -rw-r--r-- | drivers/net/s2io.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index d4df9330c447..bd6d713c861a 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); |