Merge branch 'fixes' into next

2012-05-11 11:54:34 +05:30 · 2012-05-11 11:54:34 +05:30 · 0d68ad197b
parent abd9ccc84c eab2158558
commit 0d68ad197b
1 changed files with 2 additions and 1 deletions
--- 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);
 		}