Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  BAST: Remove old IDE driver
  pcmcia ide kingston compactflash's have a new manufacturer id
  pcmcia: add another pata/ide ID
  pcmcia: add an pata/ide ID
  ide: increase timeout in wait_drive_not_busy()
  palm_bk3710: fix resource management

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 0c908ca3ff79..ab545ffa1549 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)