Commit 8b627f61 authored by Yi Wang's avatar Yi Wang Committed by Stephen Boyd

clk: boston: unregister clks on failure in clk_boston_setup()

The registered clks should unregister when something wrong happens
before going out in function clk_boston_setup().
Signed-off-by: default avatarYi Wang <wang.yi59@zte.com.cn>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 46fda5b5
...@@ -73,31 +73,39 @@ static void __init clk_boston_setup(struct device_node *np) ...@@ -73,31 +73,39 @@ static void __init clk_boston_setup(struct device_node *np)
hw = clk_hw_register_fixed_rate(NULL, "input", NULL, 0, in_freq); hw = clk_hw_register_fixed_rate(NULL, "input", NULL, 0, in_freq);
if (IS_ERR(hw)) { if (IS_ERR(hw)) {
pr_err("failed to register input clock: %ld\n", PTR_ERR(hw)); pr_err("failed to register input clock: %ld\n", PTR_ERR(hw));
goto error; goto fail_input;
} }
onecell->hws[BOSTON_CLK_INPUT] = hw; onecell->hws[BOSTON_CLK_INPUT] = hw;
hw = clk_hw_register_fixed_rate(NULL, "sys", "input", 0, sys_freq); hw = clk_hw_register_fixed_rate(NULL, "sys", "input", 0, sys_freq);
if (IS_ERR(hw)) { if (IS_ERR(hw)) {
pr_err("failed to register sys clock: %ld\n", PTR_ERR(hw)); pr_err("failed to register sys clock: %ld\n", PTR_ERR(hw));
goto error; goto fail_sys;
} }
onecell->hws[BOSTON_CLK_SYS] = hw; onecell->hws[BOSTON_CLK_SYS] = hw;
hw = clk_hw_register_fixed_rate(NULL, "cpu", "input", 0, cpu_freq); hw = clk_hw_register_fixed_rate(NULL, "cpu", "input", 0, cpu_freq);
if (IS_ERR(hw)) { if (IS_ERR(hw)) {
pr_err("failed to register cpu clock: %ld\n", PTR_ERR(hw)); pr_err("failed to register cpu clock: %ld\n", PTR_ERR(hw));
goto error; goto fail_cpu;
} }
onecell->hws[BOSTON_CLK_CPU] = hw; onecell->hws[BOSTON_CLK_CPU] = hw;
err = of_clk_add_hw_provider(np, of_clk_hw_onecell_get, onecell); err = of_clk_add_hw_provider(np, of_clk_hw_onecell_get, onecell);
if (err) if (err) {
pr_err("failed to add DT provider: %d\n", err); pr_err("failed to add DT provider: %d\n", err);
goto fail_clk_add;
}
return; return;
error: fail_clk_add:
clk_hw_unregister_fixed_rate(onecell->hws[BOSTON_CLK_CPU]);
fail_cpu:
clk_hw_unregister_fixed_rate(onecell->hws[BOSTON_CLK_SYS]);
fail_sys:
clk_hw_unregister_fixed_rate(onecell->hws[BOSTON_CLK_INPUT]);
fail_input:
kfree(onecell); kfree(onecell);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment