From: Yang Yingliang <yangyingliang@huawei.com>
Date: Wed, 4 Jan 2023 09:39:21 +0000 (+0100)
Subject: media: imx: imx7-media-csi: fix missing clk_disable_unprepare() in imx7_csi_init()
X-Git-Tag: v6.1.21~942
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4bc6977fb45cc14f78504806f3be6fce1f4a1da0;p=platform%2Fkernel%2Flinux-starfive.git

media: imx: imx7-media-csi: fix missing clk_disable_unprepare() in imx7_csi_init()

[ Upstream commit cea606d9e996a77eed57fc60709e0728341450e3 ]

Add missing clk_disable_unprepare(), if imx7_csi_dma_setup() fails
in imx7_csi_init().

Fixes: ff43ca911978 ("media: imx: imx7-media-csi: Move CSI configuration before source start")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Reviewed-by: Rui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c
index c77401f..5f6376c 100644
--- a/drivers/staging/media/imx/imx7-media-csi.c
+++ b/drivers/staging/media/imx/imx7-media-csi.c
@@ -638,8 +638,10 @@ static int imx7_csi_init(struct imx7_csi *csi)
 	imx7_csi_configure(csi);
 
 	ret = imx7_csi_dma_setup(csi);
-	if (ret < 0)
+	if (ret < 0) {
+		clk_disable_unprepare(csi->mclk);
 		return ret;
+	}
 
 	return 0;
 }