[PATCH] clk: at91: Fix memory leak

[PATCH] clk: at91: Fix memory leak

[Alexander Shiyan]

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 drivers/clk/at91/clk-master.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/at91/clk-master.c b/drivers/clk/at91/clk-master.c
index bd313f7..c1af80b 100644
--- a/drivers/clk/at91/clk-master.c
+++ b/drivers/clk/at91/clk-master.c
@@ -242,7 +242,7 @@ of_at91_clk_master_setup(struct device_node *np, struct at91_pmc *pmc,
 
 	irq = irq_of_parse_and_map(np, 0);
 	if (!irq)
-		return;
+		goto out_free_characteristics;
 
 	clk = at91_clk_register_master(pmc, irq, name, num_parents,
 				       parent_names, layout,
-- 
1.8.3.2

[PATCH] clk: at91: Fix memory leak

[Boris BREZILLON]

Hi Alexander,

Thanks for reporting and fixing this memory leak.

Unfortunately you're a bit late: this was already fixed, and I acked it 
;-) (see http://www.gossamer-threads.com/lists/linux/kernel/1865947).

Best Regards,

Boris

On 15/02/2014 17:14, Alexander Shiyan wrote:
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
>   drivers/clk/at91/clk-master.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/clk/at91/clk-master.c b/drivers/clk/at91/clk-master.c
> index bd313f7..c1af80b 100644
> --- a/drivers/clk/at91/clk-master.c
> +++ b/drivers/clk/at91/clk-master.c
> @@ -242,7 +242,7 @@ of_at91_clk_master_setup(struct device_node *np, struct at91_pmc *pmc,
>   
>   	irq = irq_of_parse_and_map(np, 0);
>   	if (!irq)
> -		return;
> +		goto out_free_characteristics;
>   
>   	clk = at91_clk_register_master(pmc, irq, name, num_parents,
>   				       parent_names, layout,

[PATCH] clk: at91: Fix memory leak

[Alexandre Belloni]

On 15/02/2014 at 17:35:44 +0100, Boris BREZILLON wrote :
> Hi Alexander,
> 
> Thanks for reporting and fixing this memory leak.
> 
> Unfortunately you're a bit late: this was already fixed, and I acked
> it ;-) (see
> http://www.gossamer-threads.com/lists/linux/kernel/1865947).
> 

Crap, I knew this looked familiar but I couldn't find it fixed in the
tree I'm working on :)

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[PATCH] clk: at91: Fix memory leak

[Alexandre Belloni]

On 15/02/2014 at 20:14:08 +0400, Alexander Shiyan wrote :
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>

Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

> ---
>  drivers/clk/at91/clk-master.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/clk/at91/clk-master.c b/drivers/clk/at91/clk-master.c
> index bd313f7..c1af80b 100644
> --- a/drivers/clk/at91/clk-master.c
> +++ b/drivers/clk/at91/clk-master.c
> @@ -242,7 +242,7 @@ of_at91_clk_master_setup(struct device_node *np, struct at91_pmc *pmc,
>  
>  	irq = irq_of_parse_and_map(np, 0);
>  	if (!irq)
> -		return;
> +		goto out_free_characteristics;
>  
>  	clk = at91_clk_register_master(pmc, irq, name, num_parents,
>  				       parent_names, layout,
> -- 
> 1.8.3.2
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com