From: Dan Carpenter Date: Wed, 13 Nov 2013 07:44:46 +0000 Subject: [patch] dmaengine: edma: double free on error in edma_prep_slave_sg() Message-Id: <20131113074446.GC25541@elgon.mountain> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Dan Williams Cc: Vinod Koul , dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org We accidentally applied two correct but duplicative fixes for a memory leak here: 4b6271a64463 ('dma: edma: Fix memory leak') 2f6d8fad0a16 ('dma: edma.c: remove edma_desc leakage') Signed-off-by: Dan Carpenter diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index ea4abaa..9c8103d 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -420,7 +420,6 @@ static struct dma_async_tx_descriptor *edma_prep_slave_sg( 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"); kfree(edesc); return NULL;