[PATCH 08/10] clk: fixed-rate: registration error handling fixup

[Turquette, Mike]

On Tue, Mar 27, 2012 at 12:23 AM, Shawn Guo <shawn.guo at linaro.org> wrote:
> The clk_register_fixed_rate should not call clk_register on "out:"
> path.
>
> Signed-off-by: Shawn Guo <shawn.guo at linaro.org>

Hi Shawn,

I already had a patch for this sitting in my fixes branch and it
properly returns -EERROR for failures, so I'll stick with that one.

Thanks,
Mike

> ---
>  drivers/clk/clk-fixed-rate.c |   19 +++++++++++++------
>  1 files changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/clk/clk-fixed-rate.c b/drivers/clk/clk-fixed-rate.c
> index 295f0d5..0d80827 100644
> --- a/drivers/clk/clk-fixed-rate.c
> +++ b/drivers/clk/clk-fixed-rate.c
> @@ -43,6 +43,7 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name,
>                unsigned long fixed_rate)
>  {
>        struct clk_fixed_rate *fixed;
> +       struct clk *clk;
>        const char **parent_names = NULL;
>
>        fixed = kzalloc(sizeof(struct clk_fixed_rate), GFP_KERNEL);
> @@ -56,21 +57,27 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name,
>        fixed->fixed_rate = fixed_rate;
>
>        if (parent_name) {
> -               parent_names = kmalloc(sizeof(char *), GFP_KERNEL);
> -
> -               if (! parent_names)
> +               parent_names = kzalloc(sizeof(char *), GFP_KERNEL);
> +               if (!parent_names)
>                        goto out;
>
>                parent_names[0] = kstrdup(parent_name, GFP_KERNEL);
> -
>                if (!parent_names[0])
>                        goto out;
>        }
>
> -out:
> -       return clk_register(dev, name,
> +       clk = clk_register(dev, name,
>                        &clk_fixed_rate_ops, &fixed->hw,
>                        parent_names,
>                        (parent_name ? 1 : 0),
>                        flags);
> +       if (clk)
> +               return clk;
> +
> +out:
> +       kfree(parent_names[0]);
> +       kfree(parent_names);
> +       kfree(fixed);
> +
> +       return NULL;
>  }
> --
> 1.7.5.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel