---

yaml --- r: 213331 b: refs/heads/master c: bcc5b6d h: refs/heads/master i: 213329: 4c5b59d 213327: ece3312 v: v3
git-mirror · Sep 5, 2010 · bd2d401 · bd2d401
1 parent 81cd37a
commit bd2d401
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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(&reg->hccr);