diff options
-rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 1d28b533564..a8a0f138bc2 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c | |||
@@ -963,6 +963,7 @@ qla2x00_setup_chip(scsi_qla_host_t *vha) | |||
963 | struct qla_hw_data *ha = vha->hw; | 963 | struct qla_hw_data *ha = vha->hw; |
964 | struct device_reg_2xxx __iomem *reg = &ha->iobase->isp; | 964 | struct device_reg_2xxx __iomem *reg = &ha->iobase->isp; |
965 | unsigned long flags; | 965 | unsigned long flags; |
966 | uint16_t fw_major_version; | ||
966 | 967 | ||
967 | if (!IS_FWI2_CAPABLE(ha) && !IS_QLA2100(ha) && !IS_QLA2200(ha)) { | 968 | if (!IS_FWI2_CAPABLE(ha) && !IS_QLA2100(ha) && !IS_QLA2200(ha)) { |
968 | /* Disable SRAM, Instruction RAM and GP RAM parity. */ | 969 | /* Disable SRAM, Instruction RAM and GP RAM parity. */ |
@@ -986,7 +987,8 @@ qla2x00_setup_chip(scsi_qla_host_t *vha) | |||
986 | 987 | ||
987 | rval = qla2x00_execute_fw(vha, srisc_address); | 988 | rval = qla2x00_execute_fw(vha, srisc_address); |
988 | /* Retrieve firmware information. */ | 989 | /* Retrieve firmware information. */ |
989 | if (rval == QLA_SUCCESS && ha->fw_major_version == 0) { | 990 | if (rval == QLA_SUCCESS) { |
991 | fw_major_version = ha->fw_major_version; | ||
990 | qla2x00_get_fw_version(vha, | 992 | qla2x00_get_fw_version(vha, |
991 | &ha->fw_major_version, | 993 | &ha->fw_major_version, |
992 | &ha->fw_minor_version, | 994 | &ha->fw_minor_version, |
@@ -1003,10 +1005,11 @@ qla2x00_setup_chip(scsi_qla_host_t *vha) | |||
1003 | ha->max_npiv_vports = | 1005 | ha->max_npiv_vports = |
1004 | MIN_MULTI_ID_FABRIC - 1; | 1006 | MIN_MULTI_ID_FABRIC - 1; |
1005 | } | 1007 | } |
1006 | qla2x00_resize_request_q(vha); | 1008 | if (!fw_major_version) { |
1007 | 1009 | qla2x00_resize_request_q(vha); | |
1008 | if (ql2xallocfwdump) | 1010 | if (ql2xallocfwdump) |
1009 | qla2x00_alloc_fw_dump(vha); | 1011 | qla2x00_alloc_fw_dump(vha); |
1012 | } | ||
1010 | } | 1013 | } |
1011 | } else { | 1014 | } else { |
1012 | DEBUG2(printk(KERN_INFO | 1015 | DEBUG2(printk(KERN_INFO |