diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2012-05-23 16:47:31 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 09:04:09 -0700 |
| commit | 2f0d20928b7360267ec80bb393971752f2351463 (patch) | |
| tree | 6c301cd56fb757ff51075aecdad2b9ecb52c51f1 | |
| parent | 3d90eeae377192032aa58c1934582cc155a2498f (diff) | |
| download | linux-3.10-2f0d20928b7360267ec80bb393971752f2351463.tar.gz linux-3.10-2f0d20928b7360267ec80bb393971752f2351463.tar.bz2 linux-3.10-2f0d20928b7360267ec80bb393971752f2351463.zip | |
dmaengine: pl330: dont complete descriptor for cyclic dma
commit 30c1dc0ff30b5552e8af555265dbeac5637cbb48 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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 fa3fb21e60b..8c44f17a99e 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -2322,7 +2322,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); } |