aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla4xxx/ql4_os.c
diff options
context:
space:
mode:
authorVikas Chaudhary <vikas.chaudhary@qlogic.com>2010-10-07 01:48:07 -0400
committerJames Bottomley <James.Bottomley@suse.de>2010-10-25 15:48:58 -0400
commitf931c5343f4a500552a3b223b1f840e802d5e1e6 (patch)
tree833318ff58f318aa3156d86999b424098c9eba70 /drivers/scsi/qla4xxx/ql4_os.c
parentf581a3f79cc7c00c1a416356011c2e274dbf6571 (diff)
[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/ql4_os.c')
-rw-r--r--drivers/scsi/qla4xxx/ql4_os.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index b24bf969b8a..6e59b59602a 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)
935{ 935{
936 uint32_t max_wait_time; 936 uint32_t max_wait_time;
937 unsigned long flags = 0; 937 unsigned long flags = 0;
938 int status = QLA_ERROR; 938 int status;
939 uint32_t ctrl_status; 939 uint32_t ctrl_status;
940 940
941 qla4xxx_hw_reset(ha); 941 status = qla4xxx_hw_reset(ha);
942 if (status != QLA_SUCCESS)
943 return status;
942 944
945 status = QLA_ERROR;
943 /* Wait until the Network Reset Intr bit is cleared */ 946 /* Wait until the Network Reset Intr bit is cleared */
944 max_wait_time = RESET_INTR_TOV; 947 max_wait_time = RESET_INTR_TOV;
945 do { 948 do {