diff options
| author | Michael Grzeschik <m.grzeschik@pengutronix.de> | 2013-09-17 09:56:08 -0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-10-04 05:05:03 -0400 |
| commit | fcaaba6c7136fe47e5a13352f99a64b019b6d2c5 (patch) | |
| tree | fac62a9876144fff179750d077c615cd970a3eb3 | |
| parent | 5a276fa6bdf82fd442046969603968c83626ce0b (diff) | |
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) | |||
| 627 | 627 | ||
| 628 | if (list_empty(&imxdmac->ld_active)) { | 628 | if (list_empty(&imxdmac->ld_active)) { |
| 629 | /* Someone might have called terminate all */ | 629 | /* Someone might have called terminate all */ |
| 630 | goto out; | 630 | spin_unlock_irqrestore(&imxdma->lock, flags); |
| 631 | return; | ||
| 631 | } | 632 | } |
| 632 | desc = list_first_entry(&imxdmac->ld_active, struct imxdma_desc, node); | 633 | desc = list_first_entry(&imxdmac->ld_active, struct imxdma_desc, node); |
| 633 | 634 | ||
| 634 | if (desc->desc.callback) | ||
| 635 | desc->desc.callback(desc->desc.callback_param); | ||
| 636 | |||
| 637 | /* If we are dealing with a cyclic descriptor, keep it on ld_active | 635 | /* If we are dealing with a cyclic descriptor, keep it on ld_active |
| 638 | * and dont mark the descriptor as complete. | 636 | * and dont mark the descriptor as complete. |
| 639 | * Only in non-cyclic cases it would be marked as complete | 637 | * Only in non-cyclic cases it would be marked as complete |
| @@ -661,6 +659,10 @@ static void imxdma_tasklet(unsigned long data) | |||
| 661 | } | 659 | } |
| 662 | out: | 660 | out: |
| 663 | spin_unlock_irqrestore(&imxdma->lock, flags); | 661 | spin_unlock_irqrestore(&imxdma->lock, flags); |
| 662 | |||
| 663 | if (desc->desc.callback) | ||
| 664 | desc->desc.callback(desc->desc.callback_param); | ||
| 665 | |||
| 664 | } | 666 | } |
| 665 | 667 | ||
| 666 | static int imxdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, | 668 | static int imxdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, |
