From 9d6c6942d1b9c3694eabc34737388a35897f4aa6 Mon Sep 17 00:00:00 2001
From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Date: Wed, 6 Oct 2010 22:48:07 -0700
Subject: [PATCH] --- yaml --- r: 221453 b: refs/heads/master c:
 f931c5343f4a500552a3b223b1f840e802d5e1e6 h: refs/heads/master i:   221451:
 63b102ce48aa019e9de7586581c220b792c70568 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/scsi/qla4xxx/ql4_os.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 68a831b1e3e1..5434c41d8903 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f581a3f79cc7c00c1a416356011c2e274dbf6571
+refs/heads/master: f931c5343f4a500552a3b223b1f840e802d5e1e6
diff --git a/trunk/drivers/scsi/qla4xxx/ql4_os.c b/trunk/drivers/scsi/qla4xxx/ql4_os.c
index b24bf969b8a9..6e59b59602a1 100644
--- a/trunk/drivers/scsi/qla4xxx/ql4_os.c
+++ b/trunk/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 {