summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGiridhar Malavali <giridhar.malavali@qlogic.com>2011-02-24 00:27:08 +0100
committerJames Bottomley <James.Bottomley@suse.de>2011-02-25 18:41:37 +0100
commit0060ddf8f7b10799e0789d10ac505cd3fb7576cb (patch)
tree389d7a1808e12d1990f9d5eac8c9710bbcde07ce /drivers
parent[SCSI] qla2xxx: Fix array subscript is above array bounds in qla2xx_build_scs... (diff)
downloadlinux-0060ddf8f7b10799e0789d10ac505cd3fb7576cb.tar.xz
linux-0060ddf8f7b10799e0789d10ac505cd3fb7576cb.zip
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/qla2xxx/qla_nx.c2
1 files changed, 2 insertions, 0 deletions
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);