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

Commit 0d5b36b8 authored Oct 07, 2011 by Manish Rangankar Committed by James Bottomley Oct 16, 2011

[SCSI] qla4xxx: updated device id check for BFS.



JIRA Key: UPSISCSI-75

Signed-off-by: Manish Rangankar <manish.rangankar@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent 69ca216e

drivers/scsi/qla4xxx/ql4_os.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -2782,12 +2782,10 @@ static int get_fw_boot_info(struct scsi_qla_host *ha, uint16_t ddb_index[])

		func_num = PCI_FUNC(ha->pdev->devfn);

		DEBUG2(ql4_printk(KERN_INFO, ha,
		"%s: Get FW boot info for 0x%x func %d\n", __func__,
		(is_qla4032(ha) ? PCI_DEVICE_ID_QLOGIC_ISP4032 :
		PCI_DEVICE_ID_QLOGIC_ISP8022), func_num));
		ql4_printk(KERN_INFO, ha, "%s: Get FW boot info for 0x%x func %d\n",
		__func__, ha->pdev->device, func_num);

		if (is_qla4032(ha)) {
		if (is_qla40XX(ha)) {
		if (func_num == 1) {
		addr = NVRAM_PORT0_BOOT_MODE;
		pri_addr = NVRAM_PORT0_BOOT_PRI_TGT;