diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-01 10:22:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-01 10:22:04 -0800 |
| commit | 71efa38c0eef581c69c221ceb8645f61d1e93270 (patch) | |
| tree | 456c1894e26fb3aa362fc8e1fd8382160dfcb344 /drivers/scsi/scsi_lib.c | |
| parent | 96789ac4b3943fec27fb6bf2713633b01a3903ad (diff) | |
| parent | e2482fa16e9eef88344a4dca1a390d29432d4add (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 4362dcde74a..701a328f7be 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1498,7 +1498,7 @@ static void scsi_kill_request(struct request *req, request_queue_t *q) static void scsi_softirq_done(struct request *rq) { struct scsi_cmnd *cmd = rq->completion_data; - unsigned long wait_for = cmd->allowed * cmd->timeout_per_command; + unsigned long wait_for = (cmd->allowed + 1) * cmd->timeout_per_command; int disposition; INIT_LIST_HEAD(&cmd->eh_entry); |