From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCCFAC678D5 for ; Tue, 7 Mar 2023 17:40:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231987AbjCGRkf (ORCPT ); Tue, 7 Mar 2023 12:40:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231984AbjCGRkR (ORCPT ); Tue, 7 Mar 2023 12:40:17 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0E6F9F20D for ; Tue, 7 Mar 2023 09:36:21 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A36E2B8199E for ; Tue, 7 Mar 2023 17:36:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01E20C433D2; Tue, 7 Mar 2023 17:36:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678210579; bh=cCqQIGm9fMkHgIyiODid/+uhkH9QJkxMWagOqX5XdTo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=14dKHR0CsMDdHUDxhBJ0B87BGjOKnyOn9cKs+8g8bbTs6l3F0MZTjUewCVoZzRv23 sHf67hgYFPk3dqp7bxxZdDxVnSvXBk2Pw2apdDl+BDw1Fk47atn7rwUOQJRTMZduaU dfEdRI6l9o3iR6tojW2b5MeRLIA2IBFU9GBwMKXQ= 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.2 0585/1001] media: imx: imx7-media-csi: fix missing clk_disable_unprepare() in imx7_csi_init() Date: Tue, 7 Mar 2023 17:55:57 +0100 Message-Id: <20230307170046.873332102@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230307170022.094103862@linuxfoundation.org> References: <20230307170022.094103862@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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/media/platform/nxp/imx7-media-csi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/platform/nxp/imx7-media-csi.c index 886374d3a6ff1..1ef92c8c0098c 100644 --- a/drivers/media/platform/nxp/imx7-media-csi.c +++ b/drivers/media/platform/nxp/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