diff options
author | Mike Hernandez <michael.hernandez@qlogic.com> | 2011-12-02 01:42:07 -0500 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2011-12-15 01:57:41 -0500 |
commit | 9acf753393cde200e9d25574c6d7d2cf57636001 (patch) | |
tree | b46502cf9d72ddfa83f7cf22be732ecf8757db93 /drivers/scsi/qla4xxx | |
parent | 4c6a794d2c0affde28f46ef5646cd41cd1a35f06 (diff) |
[SCSI] qla4xxx: Fix CPU lockups when ql4xdontresethba set
Fix issue where CPU lockup is seen when ql4xdontresethba is set and
driver is "stuck" in NEED_RESET state handler.
Signed-off-by: Mike Hernandez <michael.hernandez@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/qla4xxx')
-rw-r--r-- | drivers/scsi/qla4xxx/ql4_nx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c index f484ff438199..7fc29c6ff57e 100644 --- a/drivers/scsi/qla4xxx/ql4_nx.c +++ b/drivers/scsi/qla4xxx/ql4_nx.c | |||
@@ -1836,6 +1836,10 @@ int qla4_8xxx_device_state_handler(struct scsi_qla_host *ha) | |||
1836 | * reset handler */ | 1836 | * reset handler */ |
1837 | dev_init_timeout = jiffies + | 1837 | dev_init_timeout = jiffies + |
1838 | (ha->nx_dev_init_timeout * HZ); | 1838 | (ha->nx_dev_init_timeout * HZ); |
1839 | } else { | ||
1840 | qla4_8xxx_idc_unlock(ha); | ||
1841 | msleep(1000); | ||
1842 | qla4_8xxx_idc_lock(ha); | ||
1839 | } | 1843 | } |
1840 | qla4_8xxx_idc_unlock(ha); | 1844 | qla4_8xxx_idc_unlock(ha); |
1841 | break; | 1845 | break; |