Merge branch 'modules' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...

[~andy/linux] / drivers / ata / pata_via.c

diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index 741e7cb69d8c269adc9d2f1f4815726cd8dee260..7e3e0a5598b7f28b487d4b2bf9792b319d0befae 100644 (file)
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -355,7 +355,7 @@ static unsigned long via_mode_filter(struct ata_device *dev, unsigned long mask)
                        mask &= ~ ATA_MASK_UDMA;
                }
        }
-       return ata_bmdma_mode_filter(dev, mask);
+       return mask;
 }
 
 /**
@@ -417,8 +417,6 @@ static void via_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)
                        tf->lbam,
                        tf->lbah);
        }
-
-       ata_wait_idle(ap);
 }
 
 static int via_port_start(struct ata_port *ap)
@@ -426,7 +424,7 @@ static int via_port_start(struct ata_port *ap)
        struct via_port *vp;
        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
 
-       int ret = ata_sff_port_start(ap);
+       int ret = ata_bmdma_port_start(ap);
        if (ret < 0)
                return ret;