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 <dan.carpen...@oracle.com> 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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/