Frees gate after if statement in clk-sunxi.c

Commit Message

Nick June 14, 2014, 6:11 p.m. UTC

Signed-off-by: Nick <[e-mail]>
---
 drivers/clk/sunxi/clk-sunxi.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Sergei Shtylyov June 14, 2014, 7:35 p.m. UTC | #1

On 06/14/2014 10:11 PM, Nick wrote:

> Signed-off-by: Nick <[e-mail]>
> ---
>   drivers/clk/sunxi/clk-sunxi.c | 1 +
>   1 file changed, 1 insertion(+)

> diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
> index 4264834..6f4fc51 100644
> --- a/drivers/clk/sunxi/clk-sunxi.c
> +++ b/drivers/clk/sunxi/clk-sunxi.c
> @@ -42,6 +42,7 @@ static void __init sun4i_osc_clk_setup(struct device_node *node)
>   	u32 rate;
>
>   	if (of_property_read_u32(node, "clock-frequency", &rate))
> +		kree(gate);

    'gate' is not allocated at this point either... at least not in Linus' tree.

>   		return;

    And you forgot {} around these 2 statements.

WBR, Sergei

Adam Baker June 14, 2014, 10:06 p.m. UTC | #2

On 14/06/14 19:11, Nick wrote:
> Signed-off-by: Nick <[e-mail]>
> ---
>   drivers/clk/sunxi/clk-sunxi.c | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
> index 4264834..6f4fc51 100644
> --- a/drivers/clk/sunxi/clk-sunxi.c
> +++ b/drivers/clk/sunxi/clk-sunxi.c
> @@ -42,6 +42,7 @@ static void __init sun4i_osc_clk_setup(struct device_node *node)
>   	u32 rate;
>
>   	if (of_property_read_u32(node, "clock-frequency", &rate))
> +		kree(gate);
>   		return;

There are no braces around this so the function of this code as written 
is an unconditional return and the return shouldn't be indented. I 
suspect, without reading the rest of the file, that that isn't what you 
intended.

>
>   	/* allocate fixed-rate and gate clock structs */
>

Adam

Maxime Ripard June 15, 2014, 8:30 p.m. UTC | #3

On Sat, Jun 14, 2014 at 02:11:48PM -0400, Nick wrote:
> Signed-off-by: Nick <[e-mail]>

This should be your full real name here.

> ---
>  drivers/clk/sunxi/clk-sunxi.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
> index 4264834..6f4fc51 100644
> --- a/drivers/clk/sunxi/clk-sunxi.c
> +++ b/drivers/clk/sunxi/clk-sunxi.c
> @@ -42,6 +42,7 @@ static void __init sun4i_osc_clk_setup(struct device_node *node)
>  	u32 rate;
>  
>  	if (of_property_read_u32(node, "clock-frequency", &rate))
> +		kree(gate);

There's a typo in kfree. How does that even compile?

Patch

diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
index 4264834..6f4fc51 100644
--- a/drivers/clk/sunxi/clk-sunxi.c
+++ b/drivers/clk/sunxi/clk-sunxi.c
@@ -42,6 +42,7 @@  static void __init sun4i_osc_clk_setup(struct device_node *node)
 	u32 rate;
 
 	if (of_property_read_u32(node, "clock-frequency", &rate))
+		kree(gate);
 		return;
 
 	/* allocate fixed-rate and gate clock structs */