lkml.org 
[lkml]   [2021]   [Jul]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.12 058/160] clk: tegra: tegra124-emc: Fix clock imbalance in emc_set_timing()
    Date
    From: Yang Yingliang <yangyingliang@huawei.com>

    [ Upstream commit f13570e7e830ca4fbf4869015af8492b8918445e ]

    After calling clk_prepare_enable(), clk_disable_unprepare() needs
    be called when prepare_timing_change() failed.

    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
    Signed-off-by: Thierry Reding <treding@nvidia.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/clk/tegra/clk-tegra124-emc.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/clk/tegra/clk-tegra124-emc.c b/drivers/clk/tegra/clk-tegra124-emc.c
    index bdf6f4a51617..74c1d894cca8 100644
    --- a/drivers/clk/tegra/clk-tegra124-emc.c
    +++ b/drivers/clk/tegra/clk-tegra124-emc.c
    @@ -249,8 +249,10 @@ static int emc_set_timing(struct tegra_clk_emc *tegra,
    div = timing->parent_rate / (timing->rate / 2) - 2;

    err = tegra->prepare_timing_change(emc, timing->rate);
    - if (err)
    + if (err) {
    + clk_disable_unprepare(timing->parent);
    return err;
    + }

    spin_lock_irqsave(tegra->lock, flags);

    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-06 13:40    [W:2.361 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site