summaryrefslogtreecommitdiffstats
path: root/drivers/net/qlge
diff options
context:
space:
mode:
authorRon Mercer <ron.mercer@qlogic.com>2010-02-03 07:24:11 +0000
committerDavid S. Miller <davem@davemloft.net>2010-02-03 20:06:02 -0800
commita112fd4ce3ed965dfb8dc6791622cb4f25ba3619 (patch)
tree583b44f4196fae6afdf375a185d6409dab4cff28 /drivers/net/qlge
parent4a0b9ca015bae64df7d97c9e0a1d33159b36e69f (diff)
downloadblackbird-op-linux-a112fd4ce3ed965dfb8dc6791622cb4f25ba3619.tar.gz
blackbird-op-linux-a112fd4ce3ed965dfb8dc6791622cb4f25ba3619.zip
qlge: Move reset from eeh io_resume to slot_reset.
Issue asic reset and verify functionality before continuing to the resume call. This allows proper error code to be returned in the case the asic does not recover. Signed-off-by: Ron Mercer <ron.mercer@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlge')
-rw-r--r--drivers/net/qlge/qlge_main.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 5be3ae2f5a16..87ec72064158 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -4717,6 +4717,12 @@ static pci_ers_result_t qlge_io_slot_reset(struct pci_dev *pdev)
return PCI_ERS_RESULT_DISCONNECT;
}
pci_set_master(pdev);
+
+ if (ql_adapter_reset(qdev)) {
+ QPRINTK(qdev, DRV, ERR, "reset FAILED!\n");
+ return PCI_ERS_RESULT_DISCONNECT;
+ }
+
return PCI_ERS_RESULT_RECOVERED;
}
@@ -4726,8 +4732,6 @@ static void qlge_io_resume(struct pci_dev *pdev)
struct ql_adapter *qdev = netdev_priv(ndev);
int err = 0;
- if (ql_adapter_reset(qdev))
- QPRINTK(qdev, DRV, ERR, "reset FAILED!\n");
if (netif_running(ndev)) {
err = qlge_open(ndev);
if (err) {
OpenPOWER on IntegriCloud