summaryrefslogtreecommitdiffstats
path: root/drivers/dma/fsldma.c
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2016-10-03 09:36:11 +0530
committerVinod Koul <vinod.koul@intel.com>2016-10-03 09:36:11 +0530
commit96622bde4c3fc0b442d25646f70043a884d54285 (patch)
tree907aa9927427a9845619236d1b15a23c1de4fc8e /drivers/dma/fsldma.c
parent7afb1fa8cba1ab0b458131ad0991cd4a4e7466b2 (diff)
parentfd3c69bd19244aa8cbf859561fd1b9f4ebc1d1c3 (diff)
downloadlinux-stable-96622bde4c3fc0b442d25646f70043a884d54285.tar.gz
linux-stable-96622bde4c3fc0b442d25646f70043a884d54285.tar.bz2
linux-stable-96622bde4c3fc0b442d25646f70043a884d54285.zip
Merge branch 'topic/unmap_cleanup' into for-linus
Diffstat (limited to 'drivers/dma/fsldma.c')
-rw-r--r--drivers/dma/fsldma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index 87f6ab222d8c..51c75bf2b9b6 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -516,9 +516,9 @@ static dma_cookie_t fsldma_run_tx_complete_actions(struct fsldma_chan *chan,
if (txd->cookie > 0) {
ret = txd->cookie;
+ dma_descriptor_unmap(txd);
/* Run the link descriptor callback function */
dmaengine_desc_get_callback_invoke(txd, NULL);
- dma_descriptor_unmap(txd);
}
/* Run any dependencies */