On Thu, Jun 11, 2015 at 5:20 PM, Dan Carpenter <dan.carpenter@xxxxxxxxxx> wrote:
> This error handling hopefully isn't needed but it make the static
> checkers happy.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
>
> diff --git a/drivers/clk/meson/clk-cpu.c b/drivers/clk/meson/clk-cpu.c
> index 148e99f..71ad493 100644
> --- a/drivers/clk/meson/clk-cpu.c
> +++ b/drivers/clk/meson/clk-cpu.c
> @@ -213,22 +213,30 @@ struct clk *meson_clk_register_cpu(const struct clk_conf *clk_conf,
> if (!pclk) {
> pr_err("%s: could not lookup parent clock %s\n",
> __func__, clk_conf->clks_parent[0]);
> - return ERR_PTR(-EINVAL);
> + ret = -EINVAL;
> + goto free_clk;
> }
>
> ret = clk_notifier_register(pclk, &clk_cpu->clk_nb);
> if (ret) {
> pr_err("%s: failed to register clock notifier for %s\n",
> __func__, clk_conf->clk_name);
> - return ERR_PTR(-EINVAL);
> + goto free_clk;
> }
>
> clk = clk_register(NULL, &clk_cpu->hw);
> if (IS_ERR(clk)) {
> - clk_notifier_unregister(pclk, &clk_cpu->clk_nb);
> - kfree(clk_cpu);
> + ret = PTR_ERR(clk);
> + goto unregister_clk_nb;
> }
>
> return clk;
> +
> +unregister_clk_nb:
> + clk_notifier_unregister(pclk, &clk_cpu->clk_nb);
> +free_clk:
> + kfree(clk_cpu);
> +
> + return ERR_PTR(ret);
> }
>
Thanks Dan,
Acked-by: Carlo Caione <carlo@xxxxxxxxxxxx>
--
Carlo Caione | +39.340.80.30.096 | Endless
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
