Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 099793c6 authored by Miaoqian Lin's avatar Miaoqian Lin Committed by Greg Kroah-Hartman
Browse files

media: exynos4-is: Change clk_disable to clk_disable_unprepare 



[ Upstream commit 9fadab72a6916c7507d7fedcd644859eef995078 ]

The corresponding API for clk_prepare_enable is clk_disable_unprepare,
other than clk_disable.

Fix this by changing clk_disable to clk_disable_unprepare.

Fixes: b4155d7d ("[media] exynos4-is: Ensure fimc-is clocks are not enabled until properly configured")
Signed-off-by: default avatarMiaoqian Lin <linmq006@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d7998117

drivers/media/platform/exynos4-is/fimc-is.c

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static int fimc_is_enable_clocks(struct fimc_is *is) 
			dev_err(&is->pdev->dev, "clock %s enable failed\n",

				fimc_is_clocks[i]);

			for (--i; i >= 0; i--)

				clk_disable(is->clocks[i]);

				clk_disable_unprepare(is->clocks[i]);

			return ret;

		}

		pr_debug("enabled clock: %s\n", fimc_is_clocks[i]);