Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 282312d1 authored by Shawn Lin's avatar Shawn Lin Committed by Heiko Stuebner
Browse files

clk: rockchip: disable alt_parent clk in err cases when registering cpuclk 



Add clk_disable_unprepare to handle cpuclk->alt_parent if
rockchip_clk_register_cpuclk fails.

Signed-off-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 36714529

drivers/clk/rockchip/clk-cpu.c

+4 −2
Original line number Diff line number Diff line
@@ -290,14 +290,14 @@ struct clk *rockchip_clk_register_cpuclk(const char *name, 
		pr_err("%s: could not lookup parent clock %s\n",

		       __func__, parent_names[0]);

		ret = -EINVAL;

		goto free_cpuclk;

		goto free_alt_parent;

	}



	ret = clk_notifier_register(clk, &cpuclk->clk_nb);

	if (ret) {

		pr_err("%s: failed to register clock notifier for %s\n",

				__func__, name);

		goto free_cpuclk;

		goto free_alt_parent;

	}



	if (nrates > 0) {
@@ -326,6 +326,8 @@ struct clk *rockchip_clk_register_cpuclk(const char *name, 
	kfree(cpuclk->rate_table);

unregister_notifier:

	clk_notifier_unregister(clk, &cpuclk->clk_nb);

free_alt_parent:

	clk_disable_unprepare(cpuclk->alt_parent);

free_cpuclk:

	kfree(cpuclk);

	return ERR_PTR(ret);