diff options
| author | Vikas Chaudhary <vikas.chaudhary@qlogic.com> | 2010-10-06 22:48:07 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-10-25 14:48:58 -0500 |
| commit | f931c5343f4a500552a3b223b1f840e802d5e1e6 (patch) | |
| tree | 833318ff58f318aa3156d86999b424098c9eba70 /drivers/scsi/qla4xxx | |
| parent | f581a3f79cc7c00c1a416356011c2e274dbf6571 (diff) | |
| download | op-kernel-dev-f931c5343f4a500552a3b223b1f840e802d5e1e6.zip op-kernel-dev-f931c5343f4a500552a3b223b1f840e802d5e1e6.tar.gz | |
[SCSI] qla4xxx: honor return status of qla4xxx_hw_reset
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>
Diffstat (limited to 'drivers/scsi/qla4xxx')
| -rw-r--r-- | drivers/scsi/qla4xxx/ql4_os.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index b24bf96..6e59b59 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c @@ -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 { |
