From 72bcbefb62966a9a77d56f8d854eab0646d4e7d3 Mon Sep 17 00:00:00 2001 From: Al Boldi Date: Mon, 26 Jun 2006 00:26:13 -0700 Subject: [PATCH] --- yaml --- r: 30272 b: refs/heads/master c: 178184b60979992508130741f16499c360bc9c9a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-io.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 304a369f3848..95e377d72050 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fb0f76d8cf4f7a3ffc36dd5e1bc8ca977b68824 +refs/heads/master: 178184b60979992508130741f16499c360bc9c9a diff --git a/trunk/drivers/ide/ide-io.c b/trunk/drivers/ide/ide-io.c index 622a55c72f03..d2428cef1598 100644 --- a/trunk/drivers/ide/ide-io.c +++ b/trunk/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); }