Commit 178184b6 authored Jun 26, 2006 by Al Boldi Committed by Linus Torvalds Jun 26, 2006

[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>

parent 4fb0f76d

drivers/ide/ide-io.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -959,7 +959,7 @@ static void ide_check_pm_state(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);
		}