diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-01 14:45:47 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-01 14:45:47 -0500 |
| commit | d2dbaad8555b9a078830ac1aab7ef7a37461c640 (patch) | |
| tree | 6d455666df51db6a24834e6551e246e0c0d0d078 /drivers/scsi/scsi_lib.c | |
| parent | cccc65a3b60edaf721cdee5a14f68ba009341822 (diff) | |
| parent | 71efa38c0eef581c69c221ceb8645f61d1e93270 (diff) | |
Merge branch 'master'
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 4362dcde74af..701a328f7beb 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) | |||
| 1498 | static void scsi_softirq_done(struct request *rq) | 1498 | static void scsi_softirq_done(struct request *rq) |
| 1499 | { | 1499 | { |
| 1500 | struct scsi_cmnd *cmd = rq->completion_data; | 1500 | struct scsi_cmnd *cmd = rq->completion_data; |
| 1501 | unsigned long wait_for = cmd->allowed * cmd->timeout_per_command; | 1501 | unsigned long wait_for = (cmd->allowed + 1) * cmd->timeout_per_command; |
| 1502 | int disposition; | 1502 | int disposition; |
| 1503 | 1503 | ||
| 1504 | INIT_LIST_HEAD(&cmd->eh_entry); | 1504 | INIT_LIST_HEAD(&cmd->eh_entry); |