Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / drivers / dma / fsldma.c

diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index 911b7177eb50487dc53269ac705c9c25dc6f8638..b557ccbaa1b5b695f723c6c87f62f604c1a834b6 100644 (file)
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -516,13 +516,9 @@ static dma_cookie_t fsldma_run_tx_complete_actions(struct fsldma_chan *chan,
        if (txd->cookie > 0) {
                ret = txd->cookie;
 
-               /* Run the link descriptor callback function */
-               if (txd->callback) {
-                       chan_dbg(chan, "LD %p callback\n", desc);
-                       txd->callback(txd->callback_param);
-               }
-
                dma_descriptor_unmap(txd);
+               /* Run the link descriptor callback function */
+               dmaengine_desc_get_callback_invoke(txd, NULL);
        }
 
        /* Run any dependencies */