Skip to content

Commit

Permalink
[SCSI] qla4xxx: honor return status of qla4xxx_hw_reset
Browse files Browse the repository at this point in the history
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: Ravi Anand <ravi.anand@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
  • Loading branch information
Vikas Chaudhary authored and James Bottomley committed Oct 25, 2010
1 parent f581a3f commit f931c53
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/scsi/qla4xxx/ql4_os.c
Original file line number Diff line number Diff line change
Expand Up @@ -935,11 +935,14 @@ int qla4xxx_soft_reset(struct scsi_qla_host *ha)
{
uint32_t max_wait_time;
unsigned long flags = 0;
int status = QLA_ERROR;
int status;
uint32_t ctrl_status;

qla4xxx_hw_reset(ha);
status = qla4xxx_hw_reset(ha);
if (status != QLA_SUCCESS)
return status;

status = QLA_ERROR;
/* Wait until the Network Reset Intr bit is cleared */
max_wait_time = RESET_INTR_TOV;
do {
Expand Down

0 comments on commit f931c53

Please sign in to comment.