From f7cf77252a6ecb8fe517152855ded23bf64dafb8 Mon Sep 17 00:00:00 2001 From: Lalit Chandivade Date: Tue, 4 May 2010 15:01:23 -0700 Subject: [PATCH] --- yaml --- r: 195693 b: refs/heads/master c: 3e46f031322bdd8d1f11e17fb7cf00c38b08dd55 h: refs/heads/master i: 195691: d81f3c50f8fb79428aed30370f86500bc7ee644b v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla2xxx/qla_os.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1e2727a78056..fd4fcd8c06ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62542f4b05a4515ff75320600ffeb2e7447d25fe +refs/heads/master: 3e46f031322bdd8d1f11e17fb7cf00c38b08dd55 diff --git a/trunk/drivers/scsi/qla2xxx/qla_os.c b/trunk/drivers/scsi/qla2xxx/qla_os.c index b1adeb71a8b0..f2102db03160 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_os.c +++ b/trunk/drivers/scsi/qla2xxx/qla_os.c @@ -3697,7 +3697,6 @@ qla2xxx_pci_slot_reset(struct pci_dev *pdev) ret = PCI_ERS_RESULT_RECOVERED; clear_bit(ABORT_ISP_ACTIVE, &base_vha->dpc_flags); - pci_cleanup_aer_uncorrect_error_status(pdev); DEBUG17(qla_printk(KERN_WARNING, ha, "slot_reset-return:ret=%x\n", ret)); @@ -3721,6 +3720,8 @@ qla2xxx_pci_resume(struct pci_dev *pdev) "from slot/link_reset"); } + pci_cleanup_aer_uncorrect_error_status(pdev); + ha->flags.eeh_busy = 0; }