From e294e0de30e7684e23b6bccab11b2b1a965d48fb Mon Sep 17 00:00:00 2001
From: Vinod Koul <vinod.koul@linux.intel.com>
Date: Fri, 11 May 2012 11:54:34 +0530
Subject: [PATCH] --- yaml --- r: 308052 b: refs/heads/master c:
 0d68ad197b1a4c93b9991faafa23df6d496f7c67 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/dma/pl330.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index adb3415bf129..d17de26693c9 100644
--- 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
index 2ee6e23930ad..fa3fb21e60be 100644
--- 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);
 		}