summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAl Boldi <a1426z@gawab.com>2006-08-18 21:30:53 +0200
committerAdrian Bunk <bunk@stusta.de>2006-08-18 21:30:53 +0200
commit3cfd644882784276280c07ad4b9eb086fa44222f (patch)
tree5977cf96450e94c70e6d607096b92e8e427bafc7 /drivers
parentd2b61ec602e7d7be485725bcda8f3b847cfc380e (diff)
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> Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ide/ide-io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index c01615dec202..574855456d45 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -932,7 +932,7 @@ static ide_startstop_t start_request (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);
}