lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 212/453] clocksource/drivers/orion: Add missing clk_disable_unprepare() on error path
    Date
    From: Yang Yingliang <yangyingliang@huawei.com>

    [ 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>
    ---
    drivers/clocksource/timer-orion.c | 11 ++++++++---
    1 file changed, 8 insertions(+), 3 deletions(-)

    diff --git a/drivers/clocksource/timer-orion.c b/drivers/clocksource/timer-orion.c
    index 7d487107e3cd8..32b2563e2ad1b 100644
    --- a/drivers/clocksource/timer-orion.c
    +++ b/drivers/clocksource/timer-orion.c
    @@ -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);
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 14:49    [W:2.032 / U:0.540 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site