Commit 62eedb35 authored May 05, 2020 by Christophe JAILLET Committed by Mauro Carvalho Chehab May 05, 2020

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: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
[hverkuil-cisco@xs4all.nl: err_exlusive_rate -> err_exclusive_rate]
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

parent f4d12d80

drivers/media/platform/sunxi/sun8i-di/sun8i-di.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -941,7 +941,7 @@ static int deinterlace_runtime_resume(struct device *device)
		if (ret) {
		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);
		@@ -969,14 +969,14 @@ static int deinterlace_runtime_resume(struct device *device)

		return 0;

		err_exlusive_rate:
		clk_rate_exclusive_put(dev->mod_clk);
		err_ram_clk:
		clk_disable_unprepare(dev->ram_clk);
		err_mod_clk:
		clk_disable_unprepare(dev->mod_clk);
		err_bus_clk:
		clk_disable_unprepare(dev->bus_clk);
		err_exclusive_rate:
		clk_rate_exclusive_put(dev->mod_clk);

		return ret;
		}