diff options
author | Armen Baloyan <armen.baloyan@qlogic.com> | 2013-08-27 01:37:47 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2013-09-03 10:28:06 -0400 |
commit | f875cd4cc4cd2cf74af9cbb63624ee4b40dab0a1 (patch) | |
tree | 9e28e2f8353edbfeac139cc27fc2337fa8985d36 /drivers/scsi/qla2xxx/qla_mr.c | |
parent | 4881d095e6670c12e4606c6b1a7860f78e83daae (diff) |
[SCSI] qla2xxx: Set default critical temperature value in cases when ISPFX00 firmware doesn't provide it
Signed-off-by: Armen Baloyan <armen.baloyan@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_mr.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_mr.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c index e48a71e7933f..39d13061d742 100644 --- a/drivers/scsi/qla2xxx/qla_mr.c +++ b/drivers/scsi/qla2xxx/qla_mr.c | |||
@@ -1965,7 +1965,9 @@ qlafx00_fx_disc(scsi_qla_host_t *vha, fc_port_t *fcport, uint16_t fx_type) | |||
1965 | sizeof(vha->hw->mr.uboot_version)); | 1965 | sizeof(vha->hw->mr.uboot_version)); |
1966 | memcpy(&vha->hw->mr.fru_serial_num, pinfo->fru_serial_num, | 1966 | memcpy(&vha->hw->mr.fru_serial_num, pinfo->fru_serial_num, |
1967 | sizeof(vha->hw->mr.fru_serial_num)); | 1967 | sizeof(vha->hw->mr.fru_serial_num)); |
1968 | vha->hw->mr.critical_temperature = pinfo->nominal_temp_value; | 1968 | vha->hw->mr.critical_temperature = |
1969 | (pinfo->nominal_temp_value) ? | ||
1970 | pinfo->nominal_temp_value : QLAFX00_CRITEMP_THRSHLD; | ||
1969 | ha->mr.extended_io_enabled = (pinfo->enabled_capabilities & | 1971 | ha->mr.extended_io_enabled = (pinfo->enabled_capabilities & |
1970 | QLAFX00_EXTENDED_IO_EN_MASK) != 0; | 1972 | QLAFX00_EXTENDED_IO_EN_MASK) != 0; |
1971 | } else if (fx_type == FXDISC_GET_PORT_INFO) { | 1973 | } else if (fx_type == FXDISC_GET_PORT_INFO) { |