diff options
author | Andrew Vasquez <andrew.vasquez@qlogic.com> | 2009-03-05 14:07:03 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-03-10 10:27:54 -0400 |
commit | c6b2fca8205dc33e3bb444835769e4ea4c6bc58d (patch) | |
tree | e632c7928dc1165978c01dc21e571d029ada7079 | |
parent | ee546b6e048586381462ce7bb51c7ddc03819619 (diff) |
[SCSI] qla2xxx: Correct truncation in return-code status checking.
QLA_* return codes are 'int' in size. There were still several
legacy check-points which assumed a return-code width of 8-bits.
This could cause incorrect assumptions of 'good' status if a
return of QLA_FUNCTION_TIMEOUT.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 2 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index e54ab2f10795..87f9abc71460 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c | |||
@@ -3435,7 +3435,7 @@ qla2x00_abort_isp(scsi_qla_host_t *vha) | |||
3435 | static int | 3435 | static int |
3436 | qla2x00_restart_isp(scsi_qla_host_t *vha) | 3436 | qla2x00_restart_isp(scsi_qla_host_t *vha) |
3437 | { | 3437 | { |
3438 | uint8_t status = 0; | 3438 | int status = 0; |
3439 | uint32_t wait_time; | 3439 | uint32_t wait_time; |
3440 | struct qla_hw_data *ha = vha->hw; | 3440 | struct qla_hw_data *ha = vha->hw; |
3441 | struct req_que *req = ha->req_q_map[0]; | 3441 | struct req_que *req = ha->req_q_map[0]; |
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 2f5f72531e23..16c34760b95d 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
@@ -2568,7 +2568,7 @@ qla2x00_do_work(struct scsi_qla_host *vha) | |||
2568 | void qla2x00_relogin(struct scsi_qla_host *vha) | 2568 | void qla2x00_relogin(struct scsi_qla_host *vha) |
2569 | { | 2569 | { |
2570 | fc_port_t *fcport; | 2570 | fc_port_t *fcport; |
2571 | uint8_t status; | 2571 | int status; |
2572 | uint16_t next_loopid = 0; | 2572 | uint16_t next_loopid = 0; |
2573 | struct qla_hw_data *ha = vha->hw; | 2573 | struct qla_hw_data *ha = vha->hw; |
2574 | 2574 | ||