diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-04 13:31:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-04 13:31:39 -0700 |
| commit | a862b5c8cd5d847779a049a5fc8cf5b1e6f5fa07 (patch) | |
| tree | f64592cf9b60b3687eaabb44ffd986c54148e8f9 /drivers/scsi/qla2xxx | |
| parent | 0b662c64840fb281e5948ab6f9d60f84817277d0 (diff) | |
| parent | 3a2430708fb8f31c084503cb47240483ec2c2662 (diff) | |
| download | blackbird-op-linux-a862b5c8cd5d847779a049a5fc8cf5b1e6f5fa07.tar.gz blackbird-op-linux-a862b5c8cd5d847779a049a5fc8cf5b1e6f5fa07.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] JAZZ ESP and SUN ESP need SPI_ATTRS
[SCSI] atari_NCR5380: update_timeout removal
[SCSI] aacraid: fix shutdown handler to also disable interrupts.
[SCSI] qla2xxx: fix timeout in qla2x00_down_timeout
[SCSI] fix CONFIG_SCSI_WAIT_SCAN=m
Diffstat (limited to 'drivers/scsi/qla2xxx')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index dd076da86a46..b98136adaaae 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -2590,7 +2590,7 @@ qla2x00_down_timeout(struct semaphore *sema, unsigned long timeout) return 0; if (msleep_interruptible(step)) break; - } while (--iterations >= 0); + } while (--iterations > 0); return -ETIMEDOUT; } |
