diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 21:18:01 +0100 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 21:18:01 +0100 |
| commit | f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d (patch) | |
| tree | b027b5f3429d416b3da5b9195024007dab062a5e /drivers/scsi/scsi_lib.c | |
| parent | [SCSI] drivers/base/bus.c - export reprobe (diff) | |
| parent | [PATCH] Plug kdump shutdown race window (diff) | |
| download | linux-f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d.tar.xz linux-f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d.zip | |
Merge ../linux-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 3042520c413c..9a05076f9cf4 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1497,7 +1497,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); |