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=1795060379; b=F8wpa2Uq9qBwtNlA08TpcrM4CL071f9mKR1o5z0twaZzBgfmQn5Z51W4GSN6BPKlWVC4 2/+C5pggXAFmAn+ftk6lu8EueTJfwHoHpwj20TLxZtuqRoYATSuyXUB15/EMbwWvXuN5o 57670/EYwLbxS9FWIyWgxxJfbqKU8QSLCQyYP6nsOWlnOXeA4UvKz9uJx7FdybWBJWqIz KvxzBJBTV4bSsLeemLy4xvSwQdtkRbyjGXkIpqm/SotjFyU/mml6gQhCMy/K9Pt8vLtIC pULNuWjwPC13EBAz9+hUxn4e7InJADpkJb8VKYf5olibx9Ls3uVfoSkAd7SKF6JEu1w== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795060379; 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=YwL4pO0Dry9OggttTkcsfcP7yKa553apvngrM4/WOnM=; b=X7DK2KqtLNFDr/U/jla9V7VOGqypdU8A0c1mt7Tf0UJm3rPqCa/Ox36fCQ6mj5DsvAnf MCSVnT3FhsJdkrV9o0XzbxR395tbUVxZ93FZSDCcQTLjXi8HNaKm30XMGXMUB28xUfie/ A9wP0hcrrqdtcQfhIfvrlR0JrFCRLzX/JqTbrw0ArGwU7CL4aQzdRaRb4F02uRMvW4aB6 O5UlsVOQRN40aPZO4FAJuHhqXS84M+iJdeZqu8KQDuuFPXCS3dgT9E/K+q58WXLBztcRf BMKWouzXfYtix88Pqfq70UjqZm4GAFiu+kPM1dD+Kb45xm6hz2pB0Ljg/bf4davJRYQ== 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=HYeg9RrA; 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 CBD7E606A335; Thu, 19 Nov 2026 03:52:59 +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=HYeg9RrA Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2C88F1F000C7; Thu, 19 Nov 2026 03:52:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795060379; bh=YwL4pO0Dry9OggttTkcsfcP7yKa553apvngrM4/WOnM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HYeg9RrAp5CWW/B/z9Mwgt5F82rN1umApMjem2PQ9UoKHYmDGh8RhsnbQbcuHhwU8 awAcDN/158KrvuffPbBfFgCy5BwrkmnYlLsgxA+XrmjDtkERkoaq+E/ftf/vVEyXWM CW/mxSNxNw7kVxAVA4C1T1PivrCpcxcl6xK/P1r8= 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 5.10 1178/1848] ASoC: mediatek: mt6797: fix wrong unwind order and error code in enable_clock Date: Wed, 18 Nov 2026 15:53:36 +0100 Message-ID: <20261118150008.889538705@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@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 5.10-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