Skip to content

Commit

Permalink
dmaengine: imx-dma: dont complete descriptor for cyclic dma
Browse files Browse the repository at this point in the history
the cookie updates completed the cyclic dma descriptor wrongly. This caused the
BUG_ON to be hit as submit is called for completed descriptor

Fix this by not marking the cyclic descriptor as complete

Tested-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
  • Loading branch information
Vinod Koul committed Apr 20, 2012
1 parent dd775ae commit 60f2951
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions drivers/dma/imx-dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -571,11 +571,14 @@ static void imxdma_tasklet(unsigned long data)
if (desc->desc.callback)
desc->desc.callback(desc->desc.callback_param);

dma_cookie_complete(&desc->desc);

/* If we are dealing with a cyclic descriptor keep it on ld_active */
/* If we are dealing with a cyclic descriptor keep it on ld_active
* and dont mark the descripor as complete.
* Only in non-cyclic cases it would be marked as complete
*/
if (imxdma_chan_is_doing_cyclic(imxdmac))
goto out;
else
dma_cookie_complete(&desc->desc);

/* Free 2D slot if it was an interleaved transfer */
if (imxdmac->enabled_2d) {
Expand Down

0 comments on commit 60f2951

Please sign in to comment.