diff options
| author | Joe Carnuccio <joe.carnuccio@qlogic.com> | 2013-02-08 01:58:03 -0500 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-02-22 14:39:27 +0000 |
| commit | fe52f6e121a8e6b66a608b79deb1c383e08aa32f (patch) | |
| tree | 626270189331cabc1a86693ee3bacbfa15dbb28e /drivers/scsi/qla2xxx/qla_init.c | |
| parent | 6c3943cdb87f68a9dbb6d586f40b84622e803574 (diff) | |
| download | kernel_goldelico_gta04-fe52f6e121a8e6b66a608b79deb1c383e08aa32f.zip kernel_goldelico_gta04-fe52f6e121a8e6b66a608b79deb1c383e08aa32f.tar.gz kernel_goldelico_gta04-fe52f6e121a8e6b66a608b79deb1c383e08aa32f.tar.bz2 | |
[SCSI] qla2xxx: Integrate generic card temperature with mezz card temperature.
Give priority to I2C thermal.
Signed-off-by: Joe Carnuccio <joe.carnuccio@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_init.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index a1e5848..edf4d14 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -523,7 +523,7 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha) vha->flags.reset_active = 0; ha->flags.pci_channel_io_perm_failure = 0; ha->flags.eeh_busy = 0; - ha->flags.thermal_supported = 1; + ha->thermal_support = THERMAL_SUPPORT_I2C|THERMAL_SUPPORT_ISP; atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME); atomic_set(&vha->loop_state, LOOP_DOWN); vha->device_flags = DFLG_NO_CABLE; |