Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp666859pxb; Tue, 5 Apr 2022 18:00:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwzlIWD6MfFyv3K0eHsBnstrPfA2hJQdBVXePJi9hNp7FhrMBh8nmQZ+mGgpP+l9niD0uDA X-Received: by 2002:a17:907:3da9:b0:6db:f3f:33c2 with SMTP id he41-20020a1709073da900b006db0f3f33c2mr5846415ejc.735.1649206802193; Tue, 05 Apr 2022 18:00:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649206802; cv=none; d=google.com; s=arc-20160816; b=RvyrAGsJ9BiHvkBIuFjGQY8Vzy4yiu9c348fQH2y18/h0Py0qwOOVJCGdRISeGlDFe 7wFoBcwkVNK6Dy+ECKJXP+fjqLp0yT2kgzfrMfHCMPwrzMs94J+720Dn+8nGS5Rf7mMw Zop+6ihUNOMnJKqEOJVZcpOXYHQ1Th8wmmRuUna7ukReivjsciydk1Sb2tA+dMFC+Z/b 0DGLKrYZaHl26LKti0JCWa7s9846IRd4tFSQ5y61EkVzypUN8rhOd37KM8ByyuFrjN/5 sa8jk/v2ouu0fT5q9mYMZ/mNzEkKlBm8x/pN6gu9NBBXfW0fgCM1uyHywxyySX45dpwh 5kQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bWDFpisfsR8FDYwjSATabkzj3LNyZVuGoG2McLiaWUc=; b=NbQrdwj8VSRA6cKTwFo8F8JEXhh4A4pJh6S8lsnCQ2A7R9oHfArdYMb52Lpofrl60A oHMrE5wdizo+M4qODt1x/ecF+Zclu2Sb/bHay7jqiyGL8iC35ImEUDMmuJawQNBSnVg8 zqxnPt+n3Vf79R57xQNCgpcUFbrUXkgQ6+TiRfIYcAoXtlnyeB1BpEpnJ5VrHtkt7rJG gni8uVgFHUH/6DpP7moqjQIfC0RR3W/qDZHta6UyPb+SlBtO9uPkGNlPJ9iBKLq51C+E cmdBNp9MsdPu0kdq6f5Ps9+iIFZB00VIXISprCLrHf5S0t1rfLOykJFKN+YxQcWx0sVY CZnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hUi3Gzex; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gf21-20020a170906e21500b006e7ee06e8bfsi6282274ejb.786.2022.04.05.17.59.36; Tue, 05 Apr 2022 18:00:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hUi3Gzex; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356672AbiDEMXN (ORCPT + 99 others); Tue, 5 Apr 2022 08:23:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245052AbiDEIxE (ORCPT ); Tue, 5 Apr 2022 04:53:04 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74AD5F0E; Tue, 5 Apr 2022 01:50:41 -0700 (PDT) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 0F3DB60FFC; Tue, 5 Apr 2022 08:50:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20845C385A1; Tue, 5 Apr 2022 08:50:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649148640; bh=f0i/LJ/rej/qlGXRfE9/Nw2sVL0swZ4PvX3YV1//QE0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hUi3GzexxHoKWF0mwAYBk3rUpnStU+2o56xsl/bwgVSBKFSDlCmxddH2aciHwTrCO rxNJVzNs8oh8l84M5fVrNKxdVHd00Nd58SbRPsqwwjR+ZNApzMQxM4o92ExxXuPquN /lY3znX73PhM5rxIRXCi8pe1hYrcru6CNlDmhHp8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Miaoqian Lin , Mark Brown , Sasha Levin Subject: [PATCH 5.16 0389/1017] ASoC: msm8916-wcd-digital: Fix missing clk_disable_unprepare() in msm8916_wcd_digital_probe Date: Tue, 5 Apr 2022 09:21:42 +0200 Message-Id: <20220405070405.832556221@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070354.155796697@linuxfoundation.org> References: <20220405070354.155796697@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Miaoqian Lin [ Upstream commit 375a347da4889f64d86e1ab7f4e6702b6e9bf299 ] Fix the missing clk_disable_unprepare() before return from msm8916_wcd_digital_probe in the error handling case. Fixes: 150db8c5afa1 ("ASoC: codecs: Add msm8916-wcd digital codec") Signed-off-by: Miaoqian Lin Link: https://lore.kernel.org/r/20220307084523.28687-1-linmq006@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/msm8916-wcd-digital.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/msm8916-wcd-digital.c b/sound/soc/codecs/msm8916-wcd-digital.c index fcc10c8bc625..9ad7fc0baf07 100644 --- a/sound/soc/codecs/msm8916-wcd-digital.c +++ b/sound/soc/codecs/msm8916-wcd-digital.c @@ -1201,7 +1201,7 @@ static int msm8916_wcd_digital_probe(struct platform_device *pdev) ret = clk_prepare_enable(priv->mclk); if (ret < 0) { dev_err(dev, "failed to enable mclk %d\n", ret); - return ret; + goto err_clk; } dev_set_drvdata(dev, priv); @@ -1209,6 +1209,9 @@ static int msm8916_wcd_digital_probe(struct platform_device *pdev) return devm_snd_soc_register_component(dev, &msm8916_wcd_digital, msm8916_wcd_digital_dai, ARRAY_SIZE(msm8916_wcd_digital_dai)); +err_clk: + clk_disable_unprepare(priv->ahbclk); + return ret; } static int msm8916_wcd_digital_remove(struct platform_device *pdev) -- 2.34.1