Commit 62eedb35 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Mauro Carvalho Chehab

media: sun8i: Fix an error handling path in 'deinterlace_runtime_resume()'

It is spurious to call 'clk_disable_unprepare()' when
'clk_prepare_enable()' has not been called yet.
Re-order the error handling path to avoid it.

Fixes: a4260ea4 ("media: sun4i: Add H3 deinterlace driver")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
[hverkuil-cisco@xs4all.nl: err_exlusive_rate -> err_exclusive_rate]
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent f4d12d80
...@@ -941,7 +941,7 @@ static int deinterlace_runtime_resume(struct device *device) ...@@ -941,7 +941,7 @@ static int deinterlace_runtime_resume(struct device *device)
if (ret) { if (ret) {
dev_err(dev->dev, "Failed to enable bus clock\n"); dev_err(dev->dev, "Failed to enable bus clock\n");
goto err_exlusive_rate; goto err_exclusive_rate;
} }
ret = clk_prepare_enable(dev->mod_clk); ret = clk_prepare_enable(dev->mod_clk);
...@@ -969,14 +969,14 @@ static int deinterlace_runtime_resume(struct device *device) ...@@ -969,14 +969,14 @@ static int deinterlace_runtime_resume(struct device *device)
return 0; return 0;
err_exlusive_rate:
clk_rate_exclusive_put(dev->mod_clk);
err_ram_clk: err_ram_clk:
clk_disable_unprepare(dev->ram_clk); clk_disable_unprepare(dev->ram_clk);
err_mod_clk: err_mod_clk:
clk_disable_unprepare(dev->mod_clk); clk_disable_unprepare(dev->mod_clk);
err_bus_clk: err_bus_clk:
clk_disable_unprepare(dev->bus_clk); clk_disable_unprepare(dev->bus_clk);
err_exclusive_rate:
clk_rate_exclusive_put(dev->mod_clk);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment