diff options
author | Tushar Behera <tushar.behera@linaro.org> | 2012-05-23 07:17:31 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-06-07 04:12:58 -0400 |
commit | 30c1dc0ff30b5552e8af555265dbeac5637cbb48 (patch) | |
tree | 2f1f101e37de525fbd8c1c75a15debd5c865c4f1 | |
parent | f8f5701bdaf9134b1f90e5044a82c66324d2073f (diff) |
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>
-rw-r--r-- | drivers/dma/pl330.c | 2 |
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) | |||
2321 | /* Pick up ripe tomatoes */ | 2321 | /* Pick up ripe tomatoes */ |
2322 | list_for_each_entry_safe(desc, _dt, &pch->work_list, node) | 2322 | list_for_each_entry_safe(desc, _dt, &pch->work_list, node) |
2323 | if (desc->status == DONE) { | 2323 | if (desc->status == DONE) { |
2324 | if (pch->cyclic) | 2324 | if (!pch->cyclic) |
2325 | dma_cookie_complete(&desc->txd); | 2325 | dma_cookie_complete(&desc->txd); |
2326 | list_move_tail(&desc->node, &list); | 2326 | list_move_tail(&desc->node, &list); |
2327 | } | 2327 | } |