1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c
index d25137b04e7a..b0a460625335 100644
--- a/drivers/ide/sl82c105.c
+++ b/drivers/ide/sl82c105.c
@@ -61,7 +61,8 @@ static unsigned int get_pio_timings(ide_drive_t *drive, u8 pio)
         if (cmd_off == 0)
                 cmd_off = 1;
 
-        if (pio > 2 || ata_id_has_iordy(drive->id))
+        if ((pio > 2 || ata_id_has_iordy(drive->id)) &&
+            !(pio > 4 && ata_id_is_cfa(drive->id)))
                 iordy = 0x40;
 
         return (cmd_on - 1) << 8 | (cmd_off - 1) | iordy;
@@ -189,14 +190,13 @@ static void sl82c105_dma_start(ide_drive_t *drive)
         ide_dma_start(drive);
 }
 
-static void sl82c105_dma_timeout(ide_drive_t *drive)
+static void sl82c105_dma_clear(ide_drive_t *drive)
 {
         struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
 
-        DBG(("sl82c105_dma_timeout(drive:%s)\n", drive->name));
+        DBG(("sl82c105_dma_clear(drive:%s)\n", drive->name));
 
         sl82c105_reset_host(dev);
-        ide_dma_timeout(drive);
 }
 
 static int sl82c105_dma_end(ide_drive_t *drive)
@@ -298,7 +298,7 @@ static const struct ide_dma_ops sl82c105_dma_ops = {
         .dma_test_irq           = ide_dma_test_irq,
         .dma_lost_irq           = sl82c105_dma_lost_irq,
         .dma_timer_expiry       = ide_dma_sff_timer_expiry,
-        .dma_timeout            = sl82c105_dma_timeout,
+        .dma_clear              = sl82c105_dma_clear,
         .dma_sff_read_status    = ide_dma_sff_read_status,
 };