From: Al Boldi Date: Mon, 26 Jun 2006 07:26:13 +0000 (-0700) Subject: [PATCH] ide-io: increase timeout value to allow for slave wakeup X-Git-Tag: v2.6.17.2~5 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=27877d06fea98a4ae485250db523bb5eea27235c;p=karo-tx-linux.git [PATCH] ide-io: increase timeout value to allow for slave wakeup During an STR resume cycle, the ide master disk times-out when there is also a slave present (especially CD). Increasing the timeout in ide-io from 10,000 to 100,000 fixes this problem. Acked-by: Alan Cox Cc: Bartlomiej Zolnierkiewicz Cc: Signed-off-by: Andrew Morton Signed-off-by: Chris Wright --- diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index c01615dec202..574855456d45 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c @@ -932,7 +932,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq) printk(KERN_WARNING "%s: bus not ready on wakeup\n", drive->name); SELECT_DRIVE(drive); HWIF(drive)->OUTB(8, HWIF(drive)->io_ports[IDE_CONTROL_OFFSET]); - rc = ide_wait_not_busy(HWIF(drive), 10000); + rc = ide_wait_not_busy(HWIF(drive), 100000); if (rc) printk(KERN_WARNING "%s: drive not ready on wakeup\n", drive->name); }