diff options
| author | Vinod Koul <vinod.koul@linux.intel.com> | 2012-04-20 11:58:07 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-04-20 11:58:07 +0200 |
| commit | 60f2951e3ad9b833bc12e2ea7652be2611771792 (patch) | |
| tree | b7ac7796aca149e09e8b39b5ddc9ce208c17c118 /drivers/dma | |
| parent | Linux 3.4-rc1 (diff) | |
| download | linux-60f2951e3ad9b833bc12e2ea7652be2611771792.tar.xz linux-60f2951e3ad9b833bc12e2ea7652be2611771792.zip | |
dmaengine: imx-dma: dont complete descriptor for cyclic dma
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>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/imx-dma.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c index a45b5d2a5987..bb787d8e1529 100644 --- a/drivers/dma/imx-dma.c +++ b/drivers/dma/imx-dma.c @@ -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) { |