diff options
| author | Shawn Lin <shawn.lin@rock-chips.com> | 2016-02-15 04:33:15 +0100 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2016-02-15 22:32:00 +0100 |
| commit | 282312d1ac8aad4947a01c2caf79c9c0299fb495 (patch) | |
| tree | fbab6a0c8e44336e243f40774af80d852f48926f | |
| parent | clk: rockchip: convert manually created factor clocks to the new type (diff) | |
| download | linux-282312d1ac8aad4947a01c2caf79c9c0299fb495.tar.xz linux-282312d1ac8aad4947a01c2caf79c9c0299fb495.zip | |
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: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
| -rw-r--r-- | drivers/clk/rockchip/clk-cpu.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/clk/rockchip/clk-cpu.c b/drivers/clk/rockchip/clk-cpu.c index d07374f48caf..68a2a87717d2 100644 --- a/drivers/clk/rockchip/clk-cpu.c +++ b/drivers/clk/rockchip/clk-cpu.c @@ -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 @@ free_rate_table: 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); |