]> err.no Git - linux-2.6/commitdiff
ide-disk: extend timeout for PIO-in commands
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Fri, 25 Jan 2008 21:17:16 +0000 (22:17 +0100)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Fri, 25 Jan 2008 21:17:16 +0000 (22:17 +0100)
s/WAIT_CMD/WAIT_WORSTCASE/ to make the timeout the same as in do_rw_taskfile()

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/ide-disk.c

index a063957e9adda1108c5cca512f1fffb5e027b210..851374ef55cf8ddf833ee35150f338e133f9866a 100644 (file)
@@ -236,7 +236,8 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
                        command = lba48 ? WIN_READ_EXT : WIN_READ;
                }
 
-               ide_execute_command(drive, command, &task_in_intr, WAIT_CMD, NULL);
+               ide_execute_command(drive, command, &task_in_intr,
+                                   WAIT_WORSTCASE, NULL);
                return ide_started;
        } else {
                if (drive->mult_count) {