summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-06-20 20:53:33 +0200
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-06-20 20:53:33 +0200
commitf54feafa6d47d0aa1a96adefdc763b708b02f94f (patch)
treea14b7030652ba394656862625eaa192d271e8c99 /drivers
parentce42a54946db338e43be9a89c0f7927e02aa3a16 (diff)
downloadlinux-3.10-f54feafa6d47d0aa1a96adefdc763b708b02f94f.tar.gz
linux-3.10-f54feafa6d47d0aa1a96adefdc763b708b02f94f.tar.bz2
linux-3.10-f54feafa6d47d0aa1a96adefdc763b708b02f94f.zip
ide: increase timeout in wait_drive_not_busy()
Some ATAPI devices take longer than the current max timeout value to become ready (i.e. TEAC DV-W28ECW takes 6 ms) so increase the timeout value to 10 ms. This fixes kernel.org bugzilla bug #10887: http://bugzilla.kernel.org/show_bug.cgi?id=10887 Reported-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ide/ide-taskfile.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 0c908ca3ff7..ab545ffa154 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -225,10 +225,10 @@ static u8 wait_drive_not_busy(ide_drive_t *drive)
u8 stat;
/*
- * Last sector was transfered, wait until drive is ready.
- * This can take up to 10 usec, but we will wait max 1 ms.
+ * Last sector was transfered, wait until device is ready. This can
+ * take up to 6 ms on some ATAPI devices, so we will wait max 10 ms.
*/
- for (retries = 0; retries < 100; retries++) {
+ for (retries = 0; retries < 1000; retries++) {
stat = ide_read_status(drive);
if (stat & BUSY_STAT)