diff options
| author |   Joe Carnuccio <joe.carnuccio@qlogic.com> | 2013-02-08 01:57:45 -0500 |
|---|---|---|
| committer |   James Bottomley <JBottomley@Parallels.com> | 2013-02-22 12:23:59 +0000 |
| commit | 37f489b580929c542dddc4bb6389d3aeb9bd39be (patch) | |
| tree | 63b3d021d8f0b963dce34a6f10b8f7d23b365bc7 /drivers/scsi/qla2xxx | |
| parent | [SCSI] qla2xxx: Avoid null pointer dereference in shutdown routine. (diff) | |
| download | linux-dev-37f489b580929c542dddc4bb6389d3aeb9bd39be.tar.xz linux-dev-37f489b580929c542dddc4bb6389d3aeb9bd39be.zip | |
[SCSI] qla2xxx: Print thermal unsupported message.
When the Read SFP mailbox command fails on the thermal device,
print a message explaining that thermal is not supported.
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')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_dbg.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_mbx.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c index ba2d7a8906ad..af045ed0a230 100644 --- a/drivers/scsi/qla2xxx/qla_dbg.c +++ b/drivers/scsi/qla2xxx/qla_dbg.c @@ -12,7 +12,7 @@ * | Level | Last Value Used | Holes | * ---------------------------------------------------------------------- * | Module Init and Probe | 0x0126 | 0x4b,0xba,0xfa | - * | Mailbox commands | 0x114f | 0x111a-0x111b | + * | Mailbox commands | 0x1150 | 0x111a-0x111b | * | | | 0x112c-0x112e | * | | | 0x113a | * | Device Discovery | 0x2087 | 0x2020-0x2022, | diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index 319b0f2dad23..92d51fc78c08 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c @@ -4446,7 +4446,11 @@ qla2x00_get_thermal_temp(scsi_qla_host_t *vha, uint16_t *temp, uint16_t *frac) ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1018, "Done %s.\n", __func__); + return rval; fail: + ql_log(ql_log_warn, vha, 0x1150, + "Thermal not supported by this card " + "(ignoring further requests).\n"); return rval; } |