commit 0060ddf8f7b10799e0789d10ac505cd3fb7576cb
author Giridhar Malavali <giridhar.malavali@qlogic.com> Wed Feb 23 15:27:08 2011 -0800
committer James Bottomley <James.Bottomley@suse.de> Fri Feb 25 12:41:37 2011 -0500
tree 389d7a1808e12d1990f9d5eac8c9710bbcde07ce
parent 7c8cf2fee1027caaadf0e96145ff97f931ba4bdd

[SCSI] qla2xxx: Reinitialize the device initialize timeout value after reset on ISP82xx.

Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

drivers/scsi/qla2xxx/qla_nx.c

diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index b37445d..4ff80ee 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -3557,6 +3557,8 @@
 			break;
 		case QLA82XX_DEV_NEED_RESET:
 			qla82xx_need_reset_handler(vha);
+			dev_init_timeout = jiffies +
+				(ha->nx_dev_init_timeout * HZ);
 			break;
 		case QLA82XX_DEV_NEED_QUIESCENT:
 			qla82xx_need_qsnt_handler(vha);