xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge ../linux-2.6

Browse Source
This commit is contained in:
James Bottomley
2006-03-14 14:18:01 -06:00
parent e935d5da8e 6796313263
commit f33b5d783b
398 changed files with 4041 additions and 2845 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/scsi_lib.c
View File

@@ -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);