From: Mike Hernandez Date: Fri, 2 Dec 2011 06:42:07 +0000 (-0800) Subject: [SCSI] qla4xxx: Fix CPU lockups when ql4xdontresethba set X-Git-Tag: next-20111216~64^2~16 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9acf753393cde200e9d25574c6d7d2cf57636001;p=karo-tx-linux.git [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 Signed-off-by: Vikas Chaudhary Reviewed-by: Mike Christie Signed-off-by: James Bottomley --- 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) * reset handler */ dev_init_timeout = jiffies + (ha->nx_dev_init_timeout * HZ); + } else { + qla4_8xxx_idc_unlock(ha); + msleep(1000); + qla4_8xxx_idc_lock(ha); } qla4_8xxx_idc_unlock(ha); break;