linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] edma: free the same memory twice
@ 2013-11-22 16:54 andrew.liu200917
  2013-11-28  8:11 ` Vinod Koul
  0 siblings, 1 reply; 2+ messages in thread
From: andrew.liu200917 @ 2013-11-22 16:54 UTC (permalink / raw)
  To: dan.j.williams, vinod.koul; +Cc: dmaengine, linux-kernel, Andrew Liu

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(-)

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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] edma: free the same memory twice
  2013-11-22 16:54 [PATCH] edma: free the same memory twice andrew.liu200917
@ 2013-11-28  8:11 ` Vinod Koul
  0 siblings, 0 replies; 2+ messages in thread
From: Vinod Koul @ 2013-11-28  8:11 UTC (permalink / raw)
  To: andrew.liu200917; +Cc: dan.j.williams, dmaengine, linux-kernel

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
> 

-- 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-11-28  9:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-11-22 16:54 [PATCH] edma: free the same memory twice andrew.liu200917
2013-11-28  8:11 ` Vinod Koul

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).