summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@linux.intel.com>2012-05-11 11:54:34 +0530
committerVinod Koul <vinod.koul@linux.intel.com>2012-05-11 11:54:34 +0530
commit0d68ad197b1a4c93b9991faafa23df6d496f7c67 (patch)
treecc77a1efbacd9fb6ecdaeebc5b464de9e84cebb4 /drivers/dma
parentabd9ccc84c35cf1e296335a7b655bba40c92386c (diff)
parenteab21585580344c8533d5e7bc4edea27ad1e268f (diff)
downloadop-kernel-dev-0d68ad197b1a4c93b9991faafa23df6d496f7c67.zip
op-kernel-dev-0d68ad197b1a4c93b9991faafa23df6d496f7c67.tar.gz
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/pl330.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 2ee6e23..fa3fb21 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);
}
OpenPOWER on IntegriCloud