Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42cd4f5d authored Aug 16, 2011 by Chad Dupuis Committed by James Bottomley Aug 27, 2011

[SCSI] qla2xxx: Fix qla24xx revision check while enabling interrupts.

Since we enable interrupts before initializing the firmware, use the chip
revision from PCI config space directly to perform the chip revision check.
Also remove the unnecessary firmware attributes test.

Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent e02587d7

drivers/scsi/qla2xxx/qla_isr.c

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2529,11 +2529,10 @@ qla2x00_request_irqs(struct qla_hw_data ha, struct rsp_que rsp)
	goto skip_msi;		goto skip_msi;
	}		}

	if (IS_QLA2432(ha) && (ha->pdev->revision < QLA_MSIX_CHIP_REV_24XX \|\|		if (IS_QLA2432(ha) && (ha->pdev->revision < QLA_MSIX_CHIP_REV_24XX)) {
	!QLA_MSIX_FW_MODE_1(ha->fw_attributes))) {
	ql_log(ql_log_warn, vha, 0x0035,		ql_log(ql_log_warn, vha, 0x0035,
	"MSI-X; Unsupported ISP2432 (0x%X, 0x%X).\n",		"MSI-X; Unsupported ISP2432 (0x%X, 0x%X).\n",
	ha->pdev->revision, ha->fw_attributes);		ha->pdev->revision, QLA_MSIX_CHIP_REV_24XX);
	goto skip_msix;		goto skip_msix;
	}		}