Commit 8b495e42 authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley

[PATCH] [17/18] qla2xxx: Bus reset handler fixes

  Fix incorrect return-code check in bus-reset error handler.
Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent d9a1c54f
...@@ -147,7 +147,7 @@ static int qla2xxx_eh_abort(struct scsi_cmnd *); ...@@ -147,7 +147,7 @@ static int qla2xxx_eh_abort(struct scsi_cmnd *);
static int qla2xxx_eh_device_reset(struct scsi_cmnd *); static int qla2xxx_eh_device_reset(struct scsi_cmnd *);
static int qla2xxx_eh_bus_reset(struct scsi_cmnd *); static int qla2xxx_eh_bus_reset(struct scsi_cmnd *);
static int qla2xxx_eh_host_reset(struct scsi_cmnd *); static int qla2xxx_eh_host_reset(struct scsi_cmnd *);
static uint8_t qla2x00_loop_reset(scsi_qla_host_t *ha); static int qla2x00_loop_reset(scsi_qla_host_t *ha);
static int qla2x00_device_reset(scsi_qla_host_t *, fc_port_t *); static int qla2x00_device_reset(scsi_qla_host_t *, fc_port_t *);
static int qla2x00_proc_info(struct Scsi_Host *, char *, char **, static int qla2x00_proc_info(struct Scsi_Host *, char *, char **,
...@@ -1568,7 +1568,7 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd) ...@@ -1568,7 +1568,7 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd)
} }
if (qla2x00_wait_for_loop_ready(ha) == QLA_SUCCESS) { if (qla2x00_wait_for_loop_ready(ha) == QLA_SUCCESS) {
if (qla2x00_loop_reset(ha)) if (qla2x00_loop_reset(ha) == QLA_SUCCESS)
rval = SUCCESS; rval = SUCCESS;
} }
...@@ -1683,10 +1683,10 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd) ...@@ -1683,10 +1683,10 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
* Returns: * Returns:
* 0 = success * 0 = success
*/ */
static uint8_t static int
qla2x00_loop_reset(scsi_qla_host_t *ha) qla2x00_loop_reset(scsi_qla_host_t *ha)
{ {
uint8_t status = QLA_SUCCESS; int status = QLA_SUCCESS;
uint16_t t; uint16_t t;
os_tgt_t *tq; os_tgt_t *tq;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment