From: Chris Wright Date: Tue, 27 Jun 2006 18:44:56 +0000 (-0700) Subject: ide-io fix for resume from STR X-Git-Tag: v2.6.17.2~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a176762d14bd7d460318135b03d61912bcefd93;p=thirdparty%2Fkernel%2Fstable-queue.git ide-io fix for resume from STR --- diff --git a/queue-2.6.17/ide-io-increase-timeout-value-to-allow-for-slave-wakeup.patch b/queue-2.6.17/ide-io-increase-timeout-value-to-allow-for-slave-wakeup.patch new file mode 100644 index 00000000000..d94a5920300 --- /dev/null +++ b/queue-2.6.17/ide-io-increase-timeout-value-to-allow-for-slave-wakeup.patch @@ -0,0 +1,34 @@ +From stable-bounces@linux.kernel.org Mon Jun 26 23:43:11 2006 +Date: Mon, 26 Jun 2006 00:26:13 -0700 +From: akpm@osdl.org +To: torvalds@osdl.org +Cc: B.Zolnierkiewicz@elka.pw.edu.pl, a1426z@gawab.com, stable@kernel.org, alan@lxorguk.ukuu.org.uk +Subject: ide-io: increase timeout value to allow for slave wakeup + +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. + +Acked-by: Alan Cox +Cc: Bartlomiej Zolnierkiewicz +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Chris Wright +--- + + drivers/ide/ide-io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- linux-2.6.17.1.orig/drivers/ide/ide-io.c ++++ linux-2.6.17.1/drivers/ide/ide-io.c +@@ -932,7 +932,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); + } diff --git a/queue-2.6.17/series b/queue-2.6.17/series index b1910dcc5c9..a63aecdb300 100644 --- a/queue-2.6.17/series +++ b/queue-2.6.17/series @@ -17,3 +17,4 @@ ipv6-fix-source-address-selection.patch ipv6-addrconf-fix-default-source-address-selection-without-config_ipv6_privacy.patch ohci1394-fix-broken-suspend-resume-in-ohci1394.patch libata-minor-patch-for-ata_dflag_pio.patch +ide-io-increase-timeout-value-to-allow-for-slave-wakeup.patch