Merge branch 'fixes' into next

0d68ad19 · Vinod Koul · abd9ccc8 · eab21585 · 0d68ad19
隐藏空白更改
内联并排

Showing with 2 addition and 1 deletion

drivers/dma/pl330.c drivers/dma/pl330.c +2 -1

未找到文件。
--- 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);
 		}