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

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide: ide_scan_pcibus(): check __pci_register_driver return value
  ide: pdc202xx_new PLL input clock fix
  it821x: fix incorrect SWDMA mask
  amd74xx: resume fix
  hpt366: use correct enablebits for HPT36x
  hpt366: blacklist MAXTOR STM3320620A for UltraDMA/66
  ide: Fix a theoretical Ooops case
  ide: never called printk statement in ide-taskfile.c::wait_drive_not_busy

1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 30175c7688e8..aa06dafb74ac 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -238,7 +238,7 @@ EXPORT_SYMBOL(task_no_data_intr);
 static u8 wait_drive_not_busy(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = HWIF(drive);
-        int retries = 100;
+        int retries;
         u8 stat;
 
         /*
@@ -246,10 +246,14 @@ static u8 wait_drive_not_busy(ide_drive_t *drive)
          * This can take up to 10 usec, but we will wait max 1 ms
          * (drive_cmd_intr() waits that long).
          */
-        while (((stat = hwif->INB(IDE_STATUS_REG)) & BUSY_STAT) && retries--)
-                udelay(10);
+        for (retries = 0; retries < 100; retries++) {
+                if ((stat = hwif->INB(IDE_STATUS_REG)) & BUSY_STAT)
+                        udelay(10);
+                else
+                        break;
+        }
 
-        if (!retries)
+        if (stat & BUSY_STAT)
                 printk(KERN_ERR "%s: drive still BUSY!\n", drive->name);
 
         return stat;