mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-27 22:51:31 +00:00
clk: boston: unregister clks on failure in clk_boston_setup()
[ Upstream commit 8b627f616e
]
The registered clks should unregister when something wrong happens
before going out in function clk_boston_setup().
Signed-off-by: Yi Wang <wang.yi59@zte.com.cn>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
a460bf7d68
commit
b9d60b4072
1 changed files with 13 additions and 5 deletions
|
@ -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);
|
||||
if (IS_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;
|
||||
|
||||
hw = clk_hw_register_fixed_rate(NULL, "sys", "input", 0, sys_freq);
|
||||
if (IS_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;
|
||||
|
||||
hw = clk_hw_register_fixed_rate(NULL, "cpu", "input", 0, cpu_freq);
|
||||
if (IS_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;
|
||||
|
||||
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);
|
||||
goto fail_clk_add;
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue