aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2014-10-15 21:38:49 +0530
committerVinod Koul <vinod.koul@intel.com>2014-10-15 21:38:49 +0530
commit2856fcdc1f7b6dc237afc2dbec6fbd21fe88dd4e (patch)
treedf1adfeb56129acd267b658f81350437a5361b57 /drivers/dma
parentdmaengine: edma: check for echan->edesc => NULL in edma_dma_pause() (diff)
parentvideo: mx3fb: use dmaengine_terminate_all() API (diff)
downloadlinux-dev-2856fcdc1f7b6dc237afc2dbec6fbd21fe88dd4e.tar.xz
linux-dev-2856fcdc1f7b6dc237afc2dbec6fbd21fe88dd4e.zip
Merge branch 'topic/dma_control_cleanup_acks' into for-linus
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/coh901318.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c
index 3c6716e0b78e..e88588d8ecd3 100644
--- a/drivers/dma/coh901318.c
+++ b/drivers/dma/coh901318.c
@@ -2156,7 +2156,7 @@ coh901318_free_chan_resources(struct dma_chan *chan)
spin_unlock_irqrestore(&cohc->lock, flags);
- chan->device->device_control(chan, DMA_TERMINATE_ALL, 0);
+ dmaengine_terminate_all(chan);
}