]> git.karo-electronics.de Git - linux-beck.git/commitdiff
dma: edma: Fix memory leak in edma_prep_dma_cyclic()
authorChristian Engelmayer <cengelma@gmx.at>
Mon, 30 Dec 2013 19:48:39 +0000 (20:48 +0100)
committerVinod Koul <vinod.koul@intel.com>
Thu, 6 Mar 2014 06:18:43 +0000 (11:48 +0530)
Fix a memory leak in the edma_prep_dma_cyclic() error handling path.

Signed-off-by: Christian Engelmayer <cengelma@gmx.at>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/edma.c

index cd8da451d1995fef8b6d076005b17ad1a17b44d1..cd04eb7b182e338994f03f8f1d1f84c28d49fc40 100644 (file)
@@ -539,6 +539,7 @@ static struct dma_async_tx_descriptor *edma_prep_dma_cyclic(
                                edma_alloc_slot(EDMA_CTLR(echan->ch_num),
                                                EDMA_SLOT_ANY);
                        if (echan->slot[i] < 0) {
+                               kfree(edesc);
                                dev_err(dev, "Failed to allocate slot\n");
                                return NULL;
                        }
@@ -553,8 +554,10 @@ static struct dma_async_tx_descriptor *edma_prep_dma_cyclic(
                ret = edma_config_pset(chan, &edesc->pset[i], src_addr,
                                       dst_addr, burst, dev_width, period_len,
                                       direction);
-               if (ret < 0)
+               if (ret < 0) {
+                       kfree(edesc);
                        return NULL;
+               }
 
                if (direction == DMA_DEV_TO_MEM)
                        dst_addr += period_len;