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>

diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 5be3ae2f5a16a376995674598077f2c4292026a3..87ec7206415889834a383de24e818cf1dcf94ade 100644 (file)
--- 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) {