summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorTushar Behera <tushar.behera@linaro.org>2012-05-23 13:17:31 +0200
committerVinod Koul <vinod.koul@linux.intel.com>2012-06-07 10:12:58 +0200
commit30c1dc0ff30b5552e8af555265dbeac5637cbb48 (patch)
tree2f1f101e37de525fbd8c1c75a15debd5c865c4f1 /drivers/dma
parentLinux 3.5-rc1 (diff)
downloadlinux-30c1dc0ff30b5552e8af555265dbeac5637cbb48.tar.xz
linux-30c1dc0ff30b5552e8af555265dbeac5637cbb48.zip
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>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/pl330.c2
1 files changed, 1 insertions, 1 deletions
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);
}