From: Al Boldi <a1426z@gawab.com>
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.18-rc1~731
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=178184b60979992508130741f16499c360bc9c9a;hp=4fb0f76d8cf4f7a3ffc36dd5e1bc8ca977b68824;p=linux-2.6

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

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 622a55c72f..d2428cef15 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -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);
 	}