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>

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) {