From: Giridhar Malavali <giridhar.malavali@qlogic.com>
Date: Wed, 23 Feb 2011 23:27:08 +0000 (-0800)
Subject: [SCSI] qla2xxx: Reinitialize the device initialize timeout value after reset on ISP82xx.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0060ddf8f7b10799e0789d10ac505cd3fb7576cb;p=linux-beck.git

[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>
---

diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index b37445d4ea2f..4ff80ee1d416 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -3557,6 +3557,8 @@ qla82xx_device_state_handler(scsi_qla_host_t *vha)
 			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);