From bd2d401a632740356505b6e21882dc5570076cbe Mon Sep 17 00:00:00 2001 From: Saurav Kashyap Date: Fri, 3 Sep 2010 15:20:57 -0700 Subject: [PATCH] --- yaml --- r: 213331 b: refs/heads/master c: bcc5b6d3233688a5179f445ef06a28e055c5873a h: refs/heads/master i: 213329: 4c5b59d65083e5b872a30f5e70bbe7d5289c85b7 213327: ece33129bee25c3ecb5421f3dda2e575cacafa25 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla2xxx/qla_os.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7a1d68a203ba..e96a1a5651d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58548cb51a824276c34a3227a4917d2e2ded0daa +refs/heads/master: bcc5b6d3233688a5179f445ef06a28e055c5873a diff --git a/trunk/drivers/scsi/qla2xxx/qla_os.c b/trunk/drivers/scsi/qla2xxx/qla_os.c index 2e10f2b2e017..bdd53f0ebef0 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_os.c +++ b/trunk/drivers/scsi/qla2xxx/qla_os.c @@ -3803,6 +3803,9 @@ qla2xxx_pci_mmio_enabled(struct pci_dev *pdev) struct device_reg_2xxx __iomem *reg = &ha->iobase->isp; struct device_reg_24xx __iomem *reg24 = &ha->iobase->isp24; + if (IS_QLA82XX(ha)) + return PCI_ERS_RESULT_RECOVERED; + spin_lock_irqsave(&ha->hardware_lock, flags); if (IS_QLA2100(ha) || IS_QLA2200(ha)){ stat = RD_REG_DWORD(®->hccr);