Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[pandora-kernel.git] / drivers / ata / pata_macio.c

diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c
index 211b643..76640ac 100644 (file)
--- a/drivers/ata/pata_macio.c
+++ b/drivers/ata/pata_macio.c
@@ -720,6 +720,8 @@ static int pata_macio_port_start(struct ata_port *ap)
        if (priv->dma_table_cpu == NULL) {
                dev_err(priv->dev, "Unable to allocate DMA command list\n");
                ap->ioaddr.bmdma_addr = NULL;
+               ap->mwdma_mask = 0;
+               ap->udma_mask = 0;
        }
        return 0;
 }
@@ -917,7 +919,7 @@ static struct scsi_host_template pata_macio_sht = {
 };
 
 static struct ata_port_operations pata_macio_ops = {
-       .inherits               = &ata_sff_port_ops,
+       .inherits               = &ata_bmdma_port_ops,
 
        .freeze                 = pata_macio_freeze,
        .set_piomode            = pata_macio_set_timings,
@@ -925,7 +927,6 @@ static struct ata_port_operations pata_macio_ops = {
        .cable_detect           = pata_macio_cable_detect,
        .sff_dev_select         = pata_macio_dev_select,
        .qc_prep                = pata_macio_qc_prep,
-       .mode_filter            = ata_bmdma_mode_filter,
        .bmdma_setup            = pata_macio_bmdma_setup,
        .bmdma_start            = pata_macio_bmdma_start,
        .bmdma_stop             = pata_macio_bmdma_stop,
@@ -1109,7 +1110,7 @@ static int __devinit pata_macio_common_init(struct pata_macio_priv        *priv,
 
        /* Start it up */
        priv->irq = irq;
-       return ata_host_activate(priv->host, irq, ata_sff_interrupt, 0,
+       return ata_host_activate(priv->host, irq, ata_bmdma_interrupt, 0,
                                 &pata_macio_sht);
 }
 
@@ -1139,7 +1140,7 @@ static int __devinit pata_macio_attach(struct macio_dev *mdev,
                        "Failed to allocate private memory\n");
                return -ENOMEM;
        }
-       priv->node = of_node_get(mdev->ofdev.node);
+       priv->node = of_node_get(mdev->ofdev.dev.of_node);
        priv->mdev = mdev;
        priv->dev = &mdev->ofdev.dev;