From c52ea915d7fdc96819964b32eb124b5ccd22b9af Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 25 Jan 2008 22:17:16 +0100 Subject: 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 Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ide/ide-disk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) { -- cgit v1.2.3-59-g8ed1b