diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2014-10-15 18:08:49 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-10-15 18:08:49 +0200 |
| commit | 2856fcdc1f7b6dc237afc2dbec6fbd21fe88dd4e (patch) | |
| tree | df1adfeb56129acd267b658f81350437a5361b57 /drivers/dma | |
| parent | dmaengine: edma: check for echan->edesc => NULL in edma_dma_pause() (diff) | |
| parent | video: mx3fb: use dmaengine_terminate_all() API (diff) | |
| download | linux-2856fcdc1f7b6dc237afc2dbec6fbd21fe88dd4e.tar.xz linux-2856fcdc1f7b6dc237afc2dbec6fbd21fe88dd4e.zip | |
Merge branch 'topic/dma_control_cleanup_acks' into for-linus
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/coh901318.c | 2 |
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); } |