diff options
| author |   Vikas Chaudhary <vikas.chaudhary@qlogic.com> | 2013-12-16 06:49:37 -0500 |
|---|---|---|
| committer |   James Bottomley <JBottomley@Parallels.com> | 2014-03-15 10:19:13 -0700 |
| commit | 32436aaa226fb13ab2e63372c4453377c2a658fc (patch) | |
| tree | cea264ea6818a8a7ea2bf8d3efcfece79a4528b9 /drivers/scsi/qla4xxx/ql4_nx.c | |
| parent | [SCSI] qla4xxx: Rename ACB_STATE macros with IP_ADDRSTATE macros (diff) | |
| download | linux-dev-32436aaa226fb13ab2e63372c4453377c2a658fc.tar.xz linux-dev-32436aaa226fb13ab2e63372c4453377c2a658fc.zip | |
[SCSI] qla4xxx: Correctly handle msleep_interruptible
If waiting for signals was interrupted then the device was put to
FAILED state. Use msleep instead of msleep_interruptible to handle
this correctly.
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/ql4_nx.c')
| -rw-r--r-- | drivers/scsi/qla4xxx/ql4_nx.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c index 0ec07ecd5fa2..cbc68f915cc6 100644 --- a/drivers/scsi/qla4xxx/ql4_nx.c +++ b/drivers/scsi/qla4xxx/ql4_nx.c @@ -2820,7 +2820,7 @@ void qla4_8xxx_get_minidump(struct scsi_qla_host *ha) int qla4_8xxx_device_bootstrap(struct scsi_qla_host *ha) { int rval = QLA_ERROR; - int i, timeout; + int i; uint32_t old_count, count; int need_reset = 0, peg_stuck = 1; @@ -2828,13 +2828,7 @@ int qla4_8xxx_device_bootstrap(struct scsi_qla_host *ha) old_count = qla4_8xxx_rd_direct(ha, QLA8XXX_PEG_ALIVE_COUNTER); for (i = 0; i < 10; i++) { - timeout = msleep_interruptible(200); - if (timeout) { - qla4_8xxx_wr_direct(ha, QLA8XXX_CRB_DEV_STATE, - QLA8XXX_DEV_FAILED); - return rval; - } - + msleep(200); count = qla4_8xxx_rd_direct(ha, QLA8XXX_PEG_ALIVE_COUNTER); if (count != old_count) peg_stuck = 0; |