[PATCH AUTOSEL 4.14 08/56] clk: boston: unregister clks on failure in clk_boston_setup()

[Sasha Levin]

From: Yi Wang <wang.y...@zte.com.cn>

[ Upstream commit 8b627f616ed63dcaf922369fc14a5daf8ad03038 ]

The registered clks should unregister when something wrong happens
before going out in function clk_boston_setup().

Signed-off-by: Yi Wang <wang.y...@zte.com.cn>
Signed-off-by: Stephen Boyd <sb...@kernel.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/clk/imgtec/clk-boston.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/drivers/clk/imgtec/clk-boston.c b/drivers/clk/imgtec/clk-boston.c
index f5d54a64d33c5..dddda45127a80 100644
--- a/drivers/clk/imgtec/clk-boston.c
+++ b/drivers/clk/imgtec/clk-boston.c
@@ -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);
 }
 
-- 
2.20.1