From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B0881BA48 for ; Tue, 7 Mar 2023 18:23:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EFEF3C4339B; Tue, 7 Mar 2023 18:23:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678213410; bh=NhYw4bSy6NA5eKY0nyC03eusX43PNuiWSg4HbU9hLiQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X7wMJG7tO4BxAq21x/emOaK5GaTTVr8ZCNWDxMCAdwBeJYg+n+sKC8eZKAyEFjAY0 6NkkQtIr6lQpCaUihrqeFpMslhUtnCiqT0nEHW+zcRo9rsbGEriceYhpdUKm0/rURC pqxNMOY1+IbLnYCCllhTRDJw4zhSsWX+MvYbaxAQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yang Yingliang , Rui Miguel Silva , Laurent Pinchart , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 6.1 497/885] media: imx: imx7-media-csi: fix missing clk_disable_unprepare() in imx7_csi_init() Date: Tue, 7 Mar 2023 17:57:11 +0100 Message-Id: <20230307170024.043406018@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230307170001.594919529@linuxfoundation.org> References: <20230307170001.594919529@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Yang Yingliang [ 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 Reviewed-by: Rui Miguel Silva Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/staging/media/imx/imx7-media-csi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c index c77401f184d74..5f6376c3269ab 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; } -- 2.39.2