diff options
Diffstat (limited to 'drivers/ide/ide-io.c')
-rw-r--r-- | drivers/ide/ide-io.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 0f3e2f4f9c2c..513a5685db2f 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
@@ -640,7 +640,6 @@ static ide_startstop_t drive_cmd_intr (ide_drive_t *drive) | |||
640 | ide_hwif_t *hwif = HWIF(drive); | 640 | ide_hwif_t *hwif = HWIF(drive); |
641 | u8 *args = (u8 *) rq->buffer; | 641 | u8 *args = (u8 *) rq->buffer; |
642 | u8 stat = hwif->INB(IDE_STATUS_REG); | 642 | u8 stat = hwif->INB(IDE_STATUS_REG); |
643 | int retries = 10; | ||
644 | 643 | ||
645 | local_irq_enable_in_hardirq(); | 644 | local_irq_enable_in_hardirq(); |
646 | if (rq->cmd_type == REQ_TYPE_ATA_CMD && | 645 | if (rq->cmd_type == REQ_TYPE_ATA_CMD && |
@@ -649,8 +648,7 @@ static ide_startstop_t drive_cmd_intr (ide_drive_t *drive) | |||
649 | drive->io_32bit = 0; | 648 | drive->io_32bit = 0; |
650 | hwif->ata_input_data(drive, &args[4], args[3] * SECTOR_WORDS); | 649 | hwif->ata_input_data(drive, &args[4], args[3] * SECTOR_WORDS); |
651 | drive->io_32bit = io_32bit; | 650 | drive->io_32bit = io_32bit; |
652 | while (((stat = hwif->INB(IDE_STATUS_REG)) & BUSY_STAT) && retries--) | 651 | stat = wait_drive_not_busy(drive); |
653 | udelay(100); | ||
654 | } | 652 | } |
655 | 653 | ||
656 | if (!OK_STAT(stat, READY_STAT, BAD_STAT)) | 654 | if (!OK_STAT(stat, READY_STAT, BAD_STAT)) |