From 32c9f49b163fcaa349a7974d13d58ef728e75ff4 Mon Sep 17 00:00:00 2001
From: Saurav Kashyap <saurav.kashyap@qlogic.com>
Date: Tue, 16 Aug 2011 11:31:46 -0700
Subject: [PATCH] --- yaml --- r: 271007 b: refs/heads/master c:
 c8582ad95bcbdf46f799d310d7dfee73d941c2f4 h: refs/heads/master i:   271005:
 83f8ea86b6d9b1bcb863d9fc0f602eec2ac54bf6   271003:
 7be097349cb8213deab5968542e432bc5b7e47a5   270999:
 9bc987821d7704d085198d8c091e638360d74374   270991:
 ddd5427666581ea7e65748a4967d72b0bb565367   270975:
 3f8631d46de0cc95676087c82055c5643e3ce085 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/scsi/qla2xxx/qla_nx.c | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6618ef34d6a7..373d2ace8940 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 999916dc59dc2fb0de221ad607d58cdc88fcbbe4
+refs/heads/master: c8582ad95bcbdf46f799d310d7dfee73d941c2f4
diff --git a/trunk/drivers/scsi/qla2xxx/qla_nx.c b/trunk/drivers/scsi/qla2xxx/qla_nx.c
index b03c86b7a989..fe9db224794d 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_nx.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_nx.c
@@ -3761,10 +3761,15 @@ qla82xx_device_state_handler(scsi_qla_host_t *vha)
 			qla82xx_idc_lock(ha);
 			break;
 		case QLA82XX_DEV_NEED_RESET:
-		    if (!ql2xdontresethba)
-			qla82xx_need_reset_handler(vha);
+			if (!ql2xdontresethba)
+				qla82xx_need_reset_handler(vha);
+			else {
+				qla82xx_idc_unlock(ha);
+				msleep(1000);
+				qla82xx_idc_lock(ha);
+			}
 			dev_init_timeout = jiffies +
-				(ha->nx_dev_init_timeout * HZ);
+			    (ha->nx_dev_init_timeout * HZ);
 			break;
 		case QLA82XX_DEV_NEED_QUIESCENT:
 			qla82xx_need_qsnt_handler(vha);