[PATCH] clk: shmobile: Free 'clock' on error path

[PATCH] clk: shmobile: Free 'clock' on error path

[Stephen Boyd]

We forgot to free this clock when we return early in this code.

Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
 drivers/clk/shmobile/renesas-cpg-mssr.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/clk/shmobile/renesas-cpg-mssr.c b/drivers/clk/shmobile/renesas-cpg-mssr.c
index 925b6007e531..58e24b326a48 100644
--- a/drivers/clk/shmobile/renesas-cpg-mssr.c
+++ b/drivers/clk/shmobile/renesas-cpg-mssr.c
@@ -348,6 +348,7 @@ static void __init cpg_mssr_register_mod_clk(const struct mssr_mod_clk *mod,
 #else
 			dev_dbg(dev, "Ignoring MSTP %s to prevent disabling\n",
 				mod->name);
+			kfree(clock);
 			return;
 #endif
 		}
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH] clk: shmobile: Free 'clock' on error path

[Geert Uytterhoeven]

Hi Stephen,

On Thu, Feb 25, 2016 at 9:26 PM, Stephen Boyd <sboyd@codeaurora.org> wrote:
> We forgot to free this clock when we return early in this code.
>
> Cc: Geert Uytterhoeven <geert+renesas@glider.be>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

> ---
>  drivers/clk/shmobile/renesas-cpg-mssr.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/clk/shmobile/renesas-cpg-mssr.c b/drivers/clk/shmobile/renesas-cpg-mssr.c
> index 925b6007e531..58e24b326a48 100644
> --- a/drivers/clk/shmobile/renesas-cpg-mssr.c
> +++ b/drivers/clk/shmobile/renesas-cpg-mssr.c
> @@ -348,6 +348,7 @@ static void __init cpg_mssr_register_mod_clk(const struct mssr_mod_clk *mod,
>  #else
>                         dev_dbg(dev, "Ignoring MSTP %s to prevent disabling\n",
>                                 mod->name);
> +                       kfree(clock);
>                         return;
>  #endif

I had hoped for the whole "#else /* !CLK_ENABLE_HAND_OFF */" branch
to be removed before anyone would start to fix silly issues like this ;-)

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds