Merge remote-tracking branches 'asoc/fix/fsl-dma', 'asoc/fix/fsl-spdif', 'asoc/fix...

[linux-2.6-block.git] / drivers / ata / pata_ep93xx.c

diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c
index cad9d45749c419e51dbdf852fe67ee998796938b..6ad5c072ce348913d8c511574db503a37e798c9c 100644 (file)
--- a/drivers/ata/pata_ep93xx.c
+++ b/drivers/ata/pata_ep93xx.c
@@ -708,8 +708,8 @@ static void ep93xx_pata_dma_start(struct ata_queued_cmd *qc)
        struct dma_chan *channel = qc->dma_dir == DMA_TO_DEVICE
                ? drv_data->dma_tx_channel : drv_data->dma_rx_channel;
 
-       txd = channel->device->device_prep_slave_sg(channel, qc->sg,
-                qc->n_elem, qc->dma_dir, DMA_CTRL_ACK, NULL);
+       txd = dmaengine_prep_slave_sg(channel, qc->sg, qc->n_elem, qc->dma_dir,
+               DMA_CTRL_ACK);
        if (!txd) {
                dev_err(qc->ap->dev, "failed to prepare slave for sg dma\n");
                return;