diff options
| author | Michael Grzeschik <m.grzeschik@pengutronix.de> | 2013-09-17 15:56:08 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-10-04 11:05:03 +0200 |
| commit | fcaaba6c7136fe47e5a13352f99a64b019b6d2c5 (patch) | |
| tree | fac62a9876144fff179750d077c615cd970a3eb3 | |
| parent | dmaengine: imx-dma: fix lockdep issue between irqhandler and tasklet (diff) | |
| download | linux-fcaaba6c7136fe47e5a13352f99a64b019b6d2c5.tar.xz linux-fcaaba6c7136fe47e5a13352f99a64b019b6d2c5.zip | |
dmaengine: imx-dma: fix callback path in tasklet
We need to free the ld_active list head before jumping into the callback
routine. Otherwise the callback could run into issue_pending and change
our ld_active list head we just going to free. This will run the channel
list into an currupted and undefined state.
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
| -rw-r--r-- | drivers/dma/imx-dma.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c index 247aa7cae37c..55852c026791 100644 --- a/drivers/dma/imx-dma.c +++ b/drivers/dma/imx-dma.c @@ -627,13 +627,11 @@ static void imxdma_tasklet(unsigned long data) if (list_empty(&imxdmac->ld_active)) { /* Someone might have called terminate all */ - goto out; + spin_unlock_irqrestore(&imxdma->lock, flags); + return; } desc = list_first_entry(&imxdmac->ld_active, struct imxdma_desc, node); - if (desc->desc.callback) - desc->desc.callback(desc->desc.callback_param); - /* If we are dealing with a cyclic descriptor, keep it on ld_active * and dont mark the descriptor as complete. * Only in non-cyclic cases it would be marked as complete @@ -661,6 +659,10 @@ static void imxdma_tasklet(unsigned long data) } out: spin_unlock_irqrestore(&imxdma->lock, flags); + + if (desc->desc.callback) + desc->desc.callback(desc->desc.callback_param); + } static int imxdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, |