From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795029201; b=VaUkBaU4rzXxNPi36Dk6XBaSlM14BzsyGeovSljTMrpCRhJfb8EEMSLUh+EssZ+vwsDi ZnQEGG2vyvaIpLIUhQDLVl+1inTEADFYL9GdIEj6zTR+mJQessTu+YlkYkTLqhd7ztvMH TaXM7eVPPqiez5N6u/Zvss3g3j8I1kLasuGp0xGvPQy8QQ6SA04XaPKanGCn5j3nvfb/t 7Cn/D5stklqxYnI6g4MgkuJgbK6cksbWUnPz+v4t91THs32rxtGatWzGE2iuVlZ6O2NKF 4h8pIEdv3654Xp8vlxrwaxSGkSqFpzJmtWTwa0AqlE9rlKeAx5EB69h0wFZiRY8tdTQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795029201; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=2K+o/fFaxk3l8rg9959QvRgtbR40tLtYm4+ob0ps3CU=; b=uBgyxrOOuxNz9I1o/6i1caMLjCVxG9KKLEFcSMxSzFfxwgy5nRcwihN/ZmWz0SJVEHxj Cc49zS+hQnC9YY5Q4v6g0AGTmFl4/EE4yg5hongTHnzJWRiyaeg2Tx5U/2tC7ui9cR6rw mnTN9LigS31yAseZUckawOmRwEsEoUxKgySi7sAFbHedkk8KiNe2/syTNaTHc8LJQhfDp lnNOeEWl1pISCP6iC8dgS1Yk98vRsApTGPvvNGzjdned0+tyuB3PawoD07Hzhaq+px6eX 6BmbLYMPU5SQgj5Zj0rc490AgArcg37hFCW7DIFxdSe6AGFeeeAeYr+PaCuZgqN/rLA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=BLn7MT5Z; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6E892606A31C; Wed, 18 Nov 2026 19:13:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=BLn7MT5Z Received: by smtp.kernel.org (Postfix) with ESMTPSA id BDDDF1F000C4; Wed, 18 Nov 2026 19:13:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795029201; bh=2K+o/fFaxk3l8rg9959QvRgtbR40tLtYm4+ob0ps3CU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BLn7MT5Zo5UwWOU/zaAn5H85ca/Jex0SFXHzeiGewfR25AFsTYg05bdfCmjJKYoL+ FimgFb/whwBZhBmrI5YGq4bWJr/oC4H5zXXpd2GWdbEAOci6H1H0Nz+qh/7/HKvvwG U9qPCe7VgymHitt+vkzA0thQ+6NMQdDkHl4TAO/E= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Cezary Rojewski , bui duc phuc , Mark Brown , Sasha Levin Subject: [PATCH 6.12 0263/1756] ASoC: mediatek: mt6797: fix wrong unwind order and error code in enable_clock Date: Wed, 18 Nov 2026 15:39:50 +0100 Message-ID: <20261118150018.828949805@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: bui duc phuc [ Upstream commit e967d479b65c778cd2394ab185e289beefcf996d ] The error paths in mt6797_afe_enable_clock() use incorrect goto labels, causing clocks that failed to enable to be disabled during cleanup. Fix the goto labels to only unwind clocks that were successfully enabled, and return the actual error code. Fixes: c5e7fca928d3 ("ASoC: mt6797: add structure define and clock control function for 6797") Reviewed-by: Cezary Rojewski Signed-off-by: bui duc phuc Link: https://patch.msgid.link/20260821122840.41266-2-phucduc.bui@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/mediatek/mt6797/mt6797-afe-clk.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sound/soc/mediatek/mt6797/mt6797-afe-clk.c b/sound/soc/mediatek/mt6797/mt6797-afe-clk.c index 6f3e6acfcfab2..0ac04d73b7772 100644 --- a/sound/soc/mediatek/mt6797/mt6797-afe-clk.c +++ b/sound/soc/mediatek/mt6797/mt6797-afe-clk.c @@ -63,21 +63,21 @@ int mt6797_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_AUD], ret); - goto CLK_INFRA_SYS_AUDIO_ERR; + return ret; } ret = clk_prepare_enable(afe_priv->clk[CLK_INFRA_SYS_AUD_26M]); if (ret) { dev_err(afe->dev, "%s(), clk_prepare_enable %s fail %d\n", __func__, aud_clks[CLK_INFRA_SYS_AUD_26M], ret); - goto CLK_INFRA_SYS_AUD_26M_ERR; + goto CLK_INFRA_SYS_AUDIO_ERR; } ret = clk_prepare_enable(afe_priv->clk[CLK_TOP_MUX_AUD]); if (ret) { dev_err(afe->dev, "%s(), clk_prepare_enable %s fail %d\n", __func__, aud_clks[CLK_TOP_MUX_AUD], ret); - goto CLK_MUX_AUDIO_ERR; + goto CLK_INFRA_SYS_AUD_26M_ERR; } ret = clk_set_parent(afe_priv->clk[CLK_TOP_MUX_AUD], @@ -93,13 +93,11 @@ int mt6797_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_TOP_MUX_AUD_BUS], ret); - goto CLK_MUX_AUDIO_INTBUS_ERR; + goto CLK_MUX_AUDIO_ERR; } - return ret; + return 0; -CLK_MUX_AUDIO_INTBUS_ERR: - clk_disable_unprepare(afe_priv->clk[CLK_TOP_MUX_AUD_BUS]); CLK_MUX_AUDIO_ERR: clk_disable_unprepare(afe_priv->clk[CLK_TOP_MUX_AUD]); CLK_INFRA_SYS_AUD_26M_ERR: @@ -107,7 +105,7 @@ int mt6797_afe_enable_clock(struct mtk_base_afe *afe) CLK_INFRA_SYS_AUDIO_ERR: clk_disable_unprepare(afe_priv->clk[CLK_INFRA_SYS_AUD]); - return 0; + return ret; } int mt6797_afe_disable_clock(struct mtk_base_afe *afe) -- 2.53.0