diff mbox

edma: free the same memory twice

Message ID 1385139243-5892-1-git-send-email-andrew.liu200917@gmail.com (mailing list archive)
State Rejected
Delegated to: Vinod Koul
Headers show

Commit Message

andrew.liu200917@gmail.com Nov. 22, 2013, 4:54 p.m. UTC
From: Andrew Liu <andrew.liu200917@gmail.com>

Signed-off-by: Andrew Liu <andrew.liu200917@gmail.com>
---
 drivers/dma/edma.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

Comments

Vinod Koul Nov. 28, 2013, 8:11 a.m. UTC | #1
On Sat, Nov 23, 2013 at 12:54:03AM +0800, andrew.liu200917@gmail.com wrote:
> From: Andrew Liu <andrew.liu200917@gmail.com>
> 
> Signed-off-by: Andrew Liu <andrew.liu200917@gmail.com>

This is already fixed in Linus tree via commit commit b6d5050

--
~Vinod
> ---
>  drivers/dma/edma.c |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
> index bef8a36..04bc1be 100644
> --- a/drivers/dma/edma.c
> +++ b/drivers/dma/edma.c
> @@ -305,7 +305,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;
> -- 
> 1.7.9
>
diff mbox

Patch

diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index bef8a36..04bc1be 100644
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -305,7 +305,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;