Merge branch 'topic/unmap_cleanup' into for-linus

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

diff --git a/drivers/dma/xgene-dma.c b/drivers/dma/xgene-dma.c
index d66ed11..8b693b7 100644 (file)
--- a/drivers/dma/xgene-dma.c
+++ b/drivers/dma/xgene-dma.c
@@ -606,12 +606,11 @@ 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 */
        dmaengine_desc_get_callback_invoke(tx, NULL);
 
-       dma_descriptor_unmap(tx);
-
        /* Run any dependencies */
        dma_run_dependencies(tx);
 }