diff options
| author | Vinod Koul <vinod.koul@linux.intel.com> | 2012-05-11 08:24:34 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-05-11 08:24:34 +0200 |
| commit | 0d68ad197b1a4c93b9991faafa23df6d496f7c67 (patch) | |
| tree | cc77a1efbacd9fb6ecdaeebc5b464de9e84cebb4 /drivers/dma | |
| parent | dma: imx-sdma: keep the callbacks invoked in the tasklet (diff) | |
| parent | dmaengine: pl330: dont complete descriptor for cyclic dma (diff) | |
| download | linux-0d68ad197b1a4c93b9991faafa23df6d496f7c67.tar.xz linux-0d68ad197b1a4c93b9991faafa23df6d496f7c67.zip | |
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/pl330.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index 2ee6e23930ad..fa3fb21e60be 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -2322,7 +2322,8 @@ static void pl330_tasklet(unsigned long data) /* Pick up ripe tomatoes */ list_for_each_entry_safe(desc, _dt, &pch->work_list, node) if (desc->status == DONE) { - dma_cookie_complete(&desc->txd); + if (pch->cyclic) + dma_cookie_complete(&desc->txd); list_move_tail(&desc->node, &list); } |