Merge remote-tracking branch 'battery/for-next'

[deliverable/linux.git] / drivers / dma / xgene-dma.c

diff --git a/drivers/dma/xgene-dma.c b/drivers/dma/xgene-dma.c
index 9cb93c5b655d80f411079aff95e02f612b7f3ec0..8b693b712d0f7a09e8ccd7975280024171a18be2 100644 (file)
--- a/drivers/dma/xgene-dma.c
+++ b/drivers/dma/xgene-dma.c
@@ -606,12 +606,10 @@ static void xgene_dma_run_tx_complete_actions(struct xgene_dma_chan *chan,
                return;
 
        dma_cookie_complete(tx);
+       dma_descriptor_unmap(tx);
 
        /* Run the link descriptor callback function */
-       if (tx->callback)
-               tx->callback(tx->callback_param);
-
-       dma_descriptor_unmap(tx);
+       dmaengine_desc_get_callback_invoke(tx, NULL);
 
        /* Run any dependencies */
        dma_run_dependencies(tx);