diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2015-03-27 13:35:52 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-03-30 23:17:08 +0530 |
| commit | 02d88b735f5a60f04dbf6d051b76e1877a0d0844 (patch) | |
| tree | 898b6fbafd87b87b6734afc1fa7732902356a799 /drivers/dma | |
| parent | 5ca9e7ce6eebec53362ff779264143860ccf68cd (diff) | |
| download | linux-02d88b735f5a60f04dbf6d051b76e1877a0d0844.tar.gz linux-02d88b735f5a60f04dbf6d051b76e1877a0d0844.tar.bz2 linux-02d88b735f5a60f04dbf6d051b76e1877a0d0844.zip | |
dmaengine: omap-dma: Fix memory leak when terminating running transfer
In omap_dma_start_desc the vdesc->node is removed from the virt-dma
framework managed lists (to be precise from the desc_issued list).
If a terminate_all comes before the transfer finishes the omap_desc will
not be freed up because it is not in any of the lists and we stopped the
DMA channel so the transfer will not going to complete.
There is no special sequence for leaking memory when using cyclic (audio)
transfer: with every start and stop of a cyclic transfer the driver leaks
struct omap_desc worth of memory.
Free up the allocated memory directly in omap_dma_terminate_all() since the
framework will not going to do that for us.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
CC: <stable@vger.kernel.org>
CC: <linux-omap@vger.kernel.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/omap-dma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c index 7dd6dd121681..167dbaf65742 100644 --- a/drivers/dma/omap-dma.c +++ b/drivers/dma/omap-dma.c @@ -981,6 +981,7 @@ static int omap_dma_terminate_all(struct dma_chan *chan) * c->desc is NULL and exit.) */ if (c->desc) { + omap_dma_desc_free(&c->desc->vd); c->desc = NULL; /* Avoid stopping the dma twice */ if (!c->paused) |