Merge tag 'for-torvalds-20120418' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / usb / musb / ux500_dma.c

diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c
index 97cb45916c4351110e3a21fb2613c2954855ee9b..d05c7fbbb7030a3981eff9cb3ce8b5f5d83c3cc6 100644 (file)
--- a/drivers/usb/musb/ux500_dma.c
+++ b/drivers/usb/musb/ux500_dma.c
@@ -115,12 +115,12 @@ static bool ux500_configure_channel(struct dma_channel *channel,
        slave_conf.dst_addr = usb_fifo_addr;
        slave_conf.dst_addr_width = addr_width;
        slave_conf.dst_maxburst = 16;
+       slave_conf.device_fc = false;
 
        dma_chan->device->device_control(dma_chan, DMA_SLAVE_CONFIG,
                                             (unsigned long) &slave_conf);
 
-       dma_desc = dma_chan->device->
-                       device_prep_slave_sg(dma_chan, &sg, 1, direction,
+       dma_desc = dmaengine_prep_slave_sg(dma_chan, &sg, 1, direction,
                                             DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
        if (!dma_desc)
                return false;