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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8D274C982D8 for ; Fri, 18 Sep 2026 13:40:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ktoNsEAM8yzRGTqWXbn5tE4afzDQIVo6sEvkne09pIg=; b=jY8HW4ZXPvJ55Kr6nr+vPRWEAp gb/KD9w2683pntZtMx4l6nX1DiD4nrMmBjP2VSJc/livZtNFIieQ8pE/TfqEuL3b5rbiJv9A//ihB FfbmFWfYYmPrrid8YlKeVoZmIaMGEQ7HVSd7iCkpj96qmZuIerdncCGYL0jHUazDM+bPapAEpEEe6 F8XFdaIJb3bsRBE4nYTX4Xm74McOfyWIUvJW3RaLIfXQ8lBiK9f6q0/w8J0Z0WfDjPcGHGdEm1LlD dS3IhdGiVW+Ae7uTvQiRDb5dx3s2Mx4LTj/sIwGa3PjnqOxg7IPBpfOzyc3Rl+xtamNni30lyrN4v JJi24aOg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1x7Yoq-0000000EaSg-0rEB; Fri, 18 Sep 2026 13:40:00 +0000 Received: from mail-pz2-x0e.google.com ([2607:f8b0:4864:3b::e]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1x7Yoi-0000000EaMB-3NUS for linux-mediatek@lists.infradead.org; Fri, 18 Sep 2026 13:39:54 +0000 Received: by mail-pz2-x0e.google.com with SMTP id 41be03b00d2f7-cc4aa0f1766so512288a12.0 for ; Fri, 18 Sep 2026 06:39:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789738792; x=1790343592; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=ktoNsEAM8yzRGTqWXbn5tE4afzDQIVo6sEvkne09pIg=; b=kvVj2I/NHqkIZbD7NAJy7AX+xrbfn9A2tZCTbXFquJaj30cdHrpaK5nRFmSrCIJfd7 4bmDNbeAkDH2TTBrCsWSShNrjCTk+6Kh/Rz46f/i6kZ3alBjFDCi7nn5y5Ise4mP0yvq gVklYQQeoDhX12UgS7y+rVbQOMpishn0uib8tNhHWqObhmB38iFq61Qq2pl58rzo4Di+ KjIdtAZAPvXEKJLrrlYKyBEqywtvIWV/1SbFNeDjk9/DCKO4SJrUXx9ACoKo0WUhBkL+ tHcmzrsAXbUH2L0TM7TOkd+oOPmn+AfL7P1xhX3rcx5pm14t9HkPXStDgLrhectz8JC1 Ok3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789738792; x=1790343592; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=ktoNsEAM8yzRGTqWXbn5tE4afzDQIVo6sEvkne09pIg=; b=f9kwAH3huHsI7f/K7mk28/CM6F4Wc6zO9XKbrrycrkCsFBqpga5NW8ERsunoSrys0+ GwUxvBysmV+zsWO+IsAs6z8Bl2Pe2ciZtBgE8f3lRD4wsUv1jzXj94Mo07MK6eEHArYu pPYEqEq105ZZDaXtJbJNcDuk4ev6rds+Z5gE9giVvY4YJ7l3C1iu8/hKqgiZ71MopDS+ TCaTbVg8gnnS1YHavLrJpkDxmj7mMjMMqYWDC8m3DfkEkiwxY+1BOmY/K3BF6Wa1laIP f75JKzJNNGC/m7ZBlNHoEY2/g4aosGsF/qb8ZJzFeVZNRAjnnj4IxAS1yx1/QMyUKzwb nR9g== X-Forwarded-Encrypted: i=1; AKwUvBwbnhOtG+dm2JIIP40kbIedvXqNxd9WLrPvzkcVNEJS2ZXjGWjFrEEzFSFp7icniDZ6LHRC1p3D+xVmeWU3+w==@lists.infradead.org X-Gm-Message-State: AFuF++l/LzivhTIrl0qxSJKq2qdVDK5sEYX0eOMjFDrn+eVGVFNt5XZH JfZzhTRGGJUWS+J7CIibt9KLPaeN14sleovJVsO5a+oCQpBI7X93Q199 X-Gm-Gg: AYBFou3xMlwdI/WxK3yuCDDe7SrkcSAj0Rfb8pjkC4oAxXcmcZPf9MOfHTf/ViXPmUV 86psttqp25W/eRyMrdMRed1syuwwQbBYl4jVY6UpllQ0IGJPZHAe1BC0wcpxYEXieZrISoGccbR 6DZmt3lcBsn0o/+Wzx6P0GTa1rUc1eakhF0u1eN0IxlvJk9T9lojMnuXJdv8hhtUUJxW3t8KKT6 gc9CLrk5cj7wO5bidd7OREtHoaAjT4kgjRppw4gEao/Lh3G8mex+5VeWm+GxHcKde0YUWy1TXAj 0iYYId7FwTjF9GPN7sPA+kj1Ht4LFMgiR2WikQ+lNrBwgCMOdL60tETi1hL6KcvQQk7RCq7dAjB Gd9gNor3xC5KEC/DVCP3APwj/kosizXABMy961h0aPxtpPoPiXeqsH4wfIClT/Iv4SHbrRxgrs+ D13dPCIcOeEvkpggAVxJ6PA8WBI9VPONVSdSFsdwERR5nXn68mPJYm3TzEjVdCa+v0KdRacXpZ6 PshN09GonDVnt6Q2ECc+5mqYuQy3Bmleq7HEvQdGNXA7l5V8Y84q0LD+vn9c+KwMOMjkgbYsne/ AtudzJEe7ahRzA== X-Received: by 2002:a17:90b:398c:b0:39e:1c2c:1d4b with SMTP id 98e67ed59e1d1-39e54bcd0a9mr5957619a91.11.1789738791912; Fri, 18 Sep 2026 06:39:51 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-39e3617443asm13253792a91.9.2026.09.18.06.39.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 06:39:51 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , AngeloGioacchino Del Regno Cc: Liam Girdwood , Matthias Brugger , Jaroslav Kysela , Takashi Iwai , Kuninori Morimoto , cassiogabrielcontato@gmail.com, Linus Walleij , Bartosz Golaszewski , Mukesh Ojha , Jiaxin Yu , linux-sound@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, bui duc phuc Subject: [PATCH 02/15] ASoC: mediatek: mt8192: fix AFE clock error handling Date: Fri, 18 Sep 2026 20:38:58 +0700 Message-ID: <20260918133912.133799-3-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260918133912.133799-1-phucduc.bui@gmail.com> References: <20260918133912.133799-1-phucduc.bui@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260918_063952_838623_7EA00578 X-CRM114-Status: GOOD ( 10.24 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: bui duc phuc If a clock operation fails in mt8192_afe_enable_clock(), the function returns immediately via the EXIT label without disabling the clocks that were successfully enabled earlier in the sequence. This leaves unneeded clocks running and causes a resource leak. Properly unwind clocks enabled before an error by jumping to appropriate cleanup labels on failure. Fixes: 125ab5d588b0 ("ASoC: mediatek: mt8192: add platform driver") Signed-off-by: bui duc phuc --- sound/soc/mediatek/mt8192/mt8192-afe-clk.c | 28 +++++++++++++++------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/sound/soc/mediatek/mt8192/mt8192-afe-clk.c b/sound/soc/mediatek/mt8192/mt8192-afe-clk.c index bd778e5663b5..7647bdd463d9 100644 --- a/sound/soc/mediatek/mt8192/mt8192-afe-clk.c +++ b/sound/soc/mediatek/mt8192/mt8192-afe-clk.c @@ -220,21 +220,21 @@ int mt8192_afe_enable_clock(struct mtk_base_afe *afe) if (ret) { dev_err(afe->dev, "%s clk_prepare_enable %s fail %d\n", __func__, aud_clks[CLK_INFRA_SYS_AUDIO], ret); - goto EXIT; + return ret; } ret = clk_prepare_enable(afe_priv->clk[CLK_INFRA_AUDIO_26M]); if (ret) { dev_err(afe->dev, "%s clk_prepare_enable %s fail %d\n", __func__, aud_clks[CLK_INFRA_AUDIO_26M], ret); - goto EXIT; + goto err_disable_infra_sys_audio; } ret = clk_prepare_enable(afe_priv->clk[CLK_MUX_AUDIO]); if (ret) { dev_err(afe->dev, "%s clk_prepare_enable %s fail %d\n", __func__, aud_clks[CLK_MUX_AUDIO], ret); - goto EXIT; + goto err_disable_infra_audio_26m; } ret = clk_set_parent(afe_priv->clk[CLK_MUX_AUDIO], afe_priv->clk[CLK_CLK26M]); @@ -242,14 +242,14 @@ int mt8192_afe_enable_clock(struct mtk_base_afe *afe) dev_err(afe->dev, "%s clk_set_parent %s-%s fail %d\n", __func__, aud_clks[CLK_MUX_AUDIO], aud_clks[CLK_CLK26M], ret); - goto EXIT; + goto err_disable_mux_audio; } ret = clk_prepare_enable(afe_priv->clk[CLK_MUX_AUDIOINTBUS]); if (ret) { dev_err(afe->dev, "%s clk_prepare_enable %s fail %d\n", __func__, aud_clks[CLK_MUX_AUDIOINTBUS], ret); - goto EXIT; + goto err_disable_mux_audio; } ret = mt8192_set_audio_int_bus_parent(afe, CLK_CLK26M); @@ -257,7 +257,7 @@ int mt8192_afe_enable_clock(struct mtk_base_afe *afe) dev_err(afe->dev, "%s clk_set_parent %s-%s fail %d\n", __func__, aud_clks[CLK_MUX_AUDIOINTBUS], aud_clks[CLK_CLK26M], ret); - goto EXIT; + goto err_disable_mux_audiointbus; } ret = clk_set_parent(afe_priv->clk[CLK_TOP_MUX_AUDIO_H], @@ -266,17 +266,27 @@ int mt8192_afe_enable_clock(struct mtk_base_afe *afe) dev_err(afe->dev, "%s clk_set_parent %s-%s fail %d\n", __func__, aud_clks[CLK_TOP_MUX_AUDIO_H], aud_clks[CLK_TOP_APLL2_CK], ret); - goto EXIT; + goto err_disable_mux_audiointbus; } ret = clk_prepare_enable(afe_priv->clk[CLK_AFE]); if (ret) { dev_err(afe->dev, "%s clk_prepare_enable %s fail %d\n", __func__, aud_clks[CLK_AFE], ret); - goto EXIT; + goto err_disable_mux_audiointbus; } -EXIT: + return 0; + +err_disable_mux_audiointbus: + clk_disable_unprepare(afe_priv->clk[CLK_MUX_AUDIOINTBUS]); +err_disable_mux_audio: + clk_disable_unprepare(afe_priv->clk[CLK_MUX_AUDIO]); +err_disable_infra_audio_26m: + clk_disable_unprepare(afe_priv->clk[CLK_INFRA_AUDIO_26M]); +err_disable_infra_sys_audio: + clk_disable_unprepare(afe_priv->clk[CLK_INFRA_SYS_AUDIO]); + return ret; } -- 2.43.0