mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
clocksource/drivers/orion: Add missing clk_disable_unprepare() on error path
[ Upstream commitc1e6cad00a
] After calling clk_prepare_enable(), clk_disable_unprepare() need be called on error path. Fixes:fbe4b3566d
("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>
This commit is contained in:
parent
40f9ac2b02
commit
742d5de6c2
1 changed files with 8 additions and 3 deletions
|
@ -149,7 +149,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);
|
||||
|
@ -166,7 +167,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);
|
||||
|
@ -175,7 +176,7 @@ static int __init orion_timer_init(struct device_node *np)
|
|||
ret = setup_irq(irq, &orion_clkevt_irq);
|
||||
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;
|
||||
|
@ -188,5 +189,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);
|
||||
|
|
Loading…
Reference in a new issue