---

yaml --- r: 308052 b: refs/heads/master c: 0d68ad1 h: refs/heads/master v: v3
git-mirror · May 11, 2012 · e294e0d · e294e0d
1 parent 14579df
commit e294e0d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abd9ccc84c35cf1e296335a7b655bba40c92386c
+refs/heads/master: 0d68ad197b1a4c93b9991faafa23df6d496f7c67
diff --git a/trunk/drivers/dma/pl330.c b/trunk/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);
 		}