From: Tushar Behera <tushar.behera@linaro.org>
Date: Wed, 23 May 2012 11:17:31 +0000 (+0530)
Subject: dmaengine: pl330: dont complete descriptor for cyclic dma
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=30c1dc0ff30b5552e8af555265dbeac5637cbb48;p=linux-beck.git

dmaengine: pl330: dont complete descriptor for cyclic dma

Commit eab215855803 ("dmaengine: pl330: dont complete descriptor for
cyclic dma") wrongly completes descriptor for cyclic dma, hence following
BUG_ON is still hit with cyclic DMA operations.

kernel BUG at drivers/dma/dmaengine.h:53!

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Acked-by: Jassi Brar <jaswinder.singh@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Cc: stable <stable@vger.kernel.org>
---

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index cbcc28e79be6..6d550421da7a 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -2321,7 +2321,7 @@ 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) {
-			if (pch->cyclic)
+			if (!pch->cyclic)
 				dma_cookie_complete(&desc->txd);
 			list_move_tail(&desc->node, &list);
 		}