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

PATCH Andrew Vasquez 1 participant 1 message Jun 22, 2004

Subsystems (2)

SCSI QLogic QLA2XXX FC-SCSI driver

lore

Share & tools

lore

Andrew Vasquez

author

2004-06-22 05:57 UTC #0 lore raw

ChangeSet
1.1853 04/06/21 15:34:37 [email protected] +1 -0 Fix incorrect return-code check in bus-reset error handler.

Signed-off-by Andrew Vasquez <[email protected]>

 drivers/scsi/qla2xxx/qla_os.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

drivers/scsi/qla2xxx/qla_os.c +4 -4

diff -Nru a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
@@ -147,7 +147,7 @@
 static int qla2xxx_eh_device_reset(struct scsi_cmnd *);
 static int qla2xxx_eh_bus_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_proc_info(struct Scsi_Host *, char *, char **,

@@ -1568,7 +1568,7 @@
 	}
 
 	if (qla2x00_wait_for_loop_ready(ha) == QLA_SUCCESS) {
-		if (qla2x00_loop_reset(ha)) 
+		if (qla2x00_loop_reset(ha) == QLA_SUCCESS) 
 			rval = SUCCESS;
 	}

@@ -1683,10 +1683,10 @@
 * Returns:
 *      0 = success
 */
-static uint8_t
+static int
 qla2x00_loop_reset(scsi_qla_host_t *ha)
 {
-	uint8_t  status = QLA_SUCCESS;
+	int status = QLA_SUCCESS;
 	uint16_t t;
 	os_tgt_t        *tq;