diff options
| author | Al Boldi <a1426z@gawab.com> | 2006-06-26 00:26:13 -0700 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2006-06-29 17:17:16 -0700 |
| commit | 27877d06fea98a4ae485250db523bb5eea27235c (patch) | |
| tree | bb557ae95968c80a07bf4ae52ac5ea14fc953439 /drivers | |
| parent | f92b235f72be34e66357df72794f2baa0221524d (diff) | |
| download | linux-stable-27877d06fea98a4ae485250db523bb5eea27235c.tar.gz linux-stable-27877d06fea98a4ae485250db523bb5eea27235c.tar.bz2 linux-stable-27877d06fea98a4ae485250db523bb5eea27235c.zip | |
[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: Chris Wright <chrisw@sous-sol.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ide/ide-io.c | 2 |
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); } |