aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManish Rangankar <manish.rangankar@qlogic.com>2011-10-07 19:55:51 -0400
committerJames Bottomley <JBottomley@Parallels.com>2011-10-16 12:11:49 -0400
commit0d5b36b8b427c84b4835fe8e00b218f46638e022 (patch)
tree70ae03d2712f82b7628faaa05592a9f462fc2f99
parent69ca216e9bbbe2baf7f441ab57c5d791f439f775 (diff)
[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>
-rw-r--r--drivers/scsi/qla4xxx/ql4_os.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index fca3d2b96651..d39205c816d8 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -2782,12 +2782,10 @@ static int get_fw_boot_info(struct scsi_qla_host *ha, uint16_t ddb_index[])
2782 2782
2783 func_num = PCI_FUNC(ha->pdev->devfn); 2783 func_num = PCI_FUNC(ha->pdev->devfn);
2784 2784
2785 DEBUG2(ql4_printk(KERN_INFO, ha, 2785 ql4_printk(KERN_INFO, ha, "%s: Get FW boot info for 0x%x func %d\n",
2786 "%s: Get FW boot info for 0x%x func %d\n", __func__, 2786 __func__, ha->pdev->device, func_num);
2787 (is_qla4032(ha) ? PCI_DEVICE_ID_QLOGIC_ISP4032 :
2788 PCI_DEVICE_ID_QLOGIC_ISP8022), func_num));
2789 2787
2790 if (is_qla4032(ha)) { 2788 if (is_qla40XX(ha)) {
2791 if (func_num == 1) { 2789 if (func_num == 1) {
2792 addr = NVRAM_PORT0_BOOT_MODE; 2790 addr = NVRAM_PORT0_BOOT_MODE;
2793 pri_addr = NVRAM_PORT0_BOOT_PRI_TGT; 2791 pri_addr = NVRAM_PORT0_BOOT_PRI_TGT;