clocksource/drivers/orion: Add missing clk_disable_unprepare() on error path

[ Upstream commit c1e6cad00aa2f17845e7270e38ff3cc82c7b022a ]

After calling clk_prepare_enable(), clk_disable_unprepare() need
be called on error path.

Fixes: fbe4b3566ddc ("clocksource/drivers/orion: Convert init function...")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20201111064706.3397156-1-yangyingliang@huawei.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/clocksource/timer-orion.c b/drivers/clocksource/timer-orion.c
index d01ff41..5101e83 100644 (file)
--- a/drivers/clocksource/timer-orion.c
+++ b/drivers/clocksource/timer-orion.c
@@ -143,7 +143,8 @@ static int __init orion_timer_init(struct device_node *np)
        irq = irq_of_parse_and_map(np, 1);
        if (irq <= 0) {
                pr_err("%pOFn: unable to parse timer1 irq\n", np);
-               return -EINVAL;
+               ret = -EINVAL;
+               goto out_unprep_clk;
        }
 
        rate = clk_get_rate(clk);
@@ -160,7 +161,7 @@ static int __init orion_timer_init(struct device_node *np)
                                    clocksource_mmio_readl_down);
        if (ret) {
                pr_err("Failed to initialize mmio timer\n");
-               return ret;
+               goto out_unprep_clk;
        }
 
        sched_clock_register(orion_read_sched_clock, 32, rate);
@@ -170,7 +171,7 @@ static int __init orion_timer_init(struct device_node *np)
                          "orion_event", NULL);
        if (ret) {
                pr_err("%pOFn: unable to setup irq\n", np);
-               return ret;
+               goto out_unprep_clk;
        }
 
        ticks_per_jiffy = (clk_get_rate(clk) + HZ/2) / HZ;
@@ -183,5 +184,9 @@ static int __init orion_timer_init(struct device_node *np)
        orion_delay_timer_init(rate);
 
        return 0;
+
+out_unprep_clk:
+       clk_disable_unprepare(clk);
+       return ret;
 }
 TIMER_OF_DECLARE(orion_timer, "marvell,orion-timer", orion_timer_init);