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

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

diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index f4c9f98ec35e51ac0ba46ae07ea7cb214d2988b3..d550efbc70540c1ba62290a3e4ac64360c3b98e5 100644 (file)
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -206,14 +206,11 @@ mv_desc_run_tx_complete_actions(struct mv_xor_desc_slot *desc,
        if (desc->async_tx.cookie > 0) {
                cookie = desc->async_tx.cookie;
 
+               dma_descriptor_unmap(&desc->async_tx);
                /* call the callback (must not sleep or submit new
                 * operations to this channel)
                 */
-               if (desc->async_tx.callback)
-                       desc->async_tx.callback(
-                               desc->async_tx.callback_param);
-
-               dma_descriptor_unmap(&desc->async_tx);
+               dmaengine_desc_get_callback_invoke(&desc->async_tx, NULL);
        }
 
        /* run dependent operations */