Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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 <alan@lxorguk.ukuu.org.uk>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Al Boldi and committed by
Linus Torvalds
178184b6 4fb0f76d

+1 -1
+1 -1
drivers/ide/ide-io.c
··· 959 959 printk(KERN_WARNING "%s: bus not ready on wakeup\n", drive->name); 960 960 SELECT_DRIVE(drive); 961 961 HWIF(drive)->OUTB(8, HWIF(drive)->io_ports[IDE_CONTROL_OFFSET]); 962 - rc = ide_wait_not_busy(HWIF(drive), 10000); 962 + rc = ide_wait_not_busy(HWIF(drive), 100000); 963 963 if (rc) 964 964 printk(KERN_WARNING "%s: drive not ready on wakeup\n", drive->name); 965 965 }