Subject: [PATCH] clk:at91: Fix memory leak in of_at91_clk_master_setup()

From: [email-masked] (Boris BREZILLON)
Date: Sat, 15 Feb 2014 18:08:12 +0100

Hi Mike,

Could you take this patch for the next 3.14 release ?

Best Regards,

Boris

On 11/02/2014 14:18, Boris BREZILLON wrote:
> On 11/02/2014 14:15, Masanari Iida wrote:
>> cppcheck detected following error
>> [clk-master.c:245]: (error) Memory leak: characteristics
>>
>> The original code forgot to free characteristics when
>> irq_of_parse_and_map() failed.
>>
>> Signed-off-by: Masanari Iida <[email-masked]>
> Acked-by Boris BREZILLON <[email-masked]>
>
> Thanks for fixing this.
>
> Best Regards,
>
> Boris
>> ---
>>   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,
>