aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-25 22:17:16 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-25 22:17:16 +0100
commitc52ea915d7fdc96819964b32eb124b5ccd22b9af (patch)
treecc2556f9343a06741f4e7c1b34e2ccf4923cdf53
parentide: remove 'handler' field from ide_task_t (take 2) (diff)
downloadlinux-dev-c52ea915d7fdc96819964b32eb124b5ccd22b9af.tar.xz
linux-dev-c52ea915d7fdc96819964b32eb124b5ccd22b9af.zip
ide-disk: extend timeout for PIO-in commands
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>
-rw-r--r--drivers/ide/ide-disk.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index a063957e9add..851374ef55cf 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -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) {