From: Al Boldi 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. Cc: Alan Cox Cc: Bartlomiej Zolnierkiewicz Cc: Signed-off-by: Andrew Morton --- drivers/ide/ide-io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/ide/ide-io.c~ide-io-increase-timeout-value-to-allow-for-slave-wakeup drivers/ide/ide-io.c --- devel/drivers/ide/ide-io.c~ide-io-increase-timeout-value-to-allow-for-slave-wakeup 2006-05-19 16:01:44.000000000 -0700 +++ devel-akpm/drivers/ide/ide-io.c 2006-05-19 16:01:44.000000000 -0700 @@ -988,7 +988,7 @@ static ide_startstop_t start_request (id 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); } _