lkml.org 
[lkml]   [2021]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH -next] clk: tegra: tegra124-emc: fix missing clk_disable_unprepare() on error in emc_set_timing()
From
Date
Why does the subject have -next in it?

Quoting Yang Yingliang (2021-05-17 21:42:47)
> After calling clk_prepare_enable(), clk_disable_unprepare() need
> be called when prepare_timing_change() failed.
>
> Fixes: 2db04f16b589 ("clk: tegra: Add EMC clock driver")

And then the Fixes tag is for a patch that was merged in v4.10?

> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> ---
> 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);
>

Looks correct to me. I assume Thierry will pick it up for the next merge
window.

\
 
 \ /
  Last update: 2021-06-02 09:59    [W:0.185 / U:0.240 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site