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=1795015724; b=2T0s938WfArdFtZ8SuVfU2gzkRH/PuRRn6XGk2ncmGff26fXGfTIaJZHEq8z7RhVm7Jd 9nCY0RkWJ8vffW+y94ans0dKQzmvmDJWcvWpO5lIerNb6JdIc+kw8uNi/ATyuPXAgApAF RVLBn9rqpk71lwcCbiSuit15XU44/oZyDXznvgMZeUoGXxFlM/+QasDsAc4tyerygNuZF 5oi/OTlTmYlCe0jUJkaLB5Iqzsg7t6PfoxfoHL3sS7lwFXUqAQxllP8UagMl/9B4pHird zpktKsbLta260jSGMOMFeHItU8boBkqmt0zLdEcGruCQz9YTy7q/ldP8mdle8He6DrQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795015724; 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=Y7k0nm5IKFe2UcXuWlpkN5V9iqmYRc2BdLjLVs6XQsw=; b=BiTTCXDYP9sobT8lQvAtikYzwDJnSxK7X+MUaieWkm8C4FBC36/sm2jsPjpiUkSpO8vP DB8ib0dvYz10GzLg1iUMPSDpAwhMZQRWwNGhUuoENMKjmvVHsVx3NK0sWmp5b856ihTvs vIvpIZOEtjoaaytXbtz01SeIGPIfNovToqPLhyNDtZMGi5kBBadTt25s2yT3UPqLfEwox ZlNsVg5KCuCss+NWSRxj48gUQV0njqgRMvWNvZIhimvfULiFNdEJ6a49DglY7mMVM/B6s oNns3CSCSpSv63GlIVDvt4m6rLyCcl5f2DIPzhmtSjFLSERY0jqaQIJUjHOQREO3WCA== 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=MzIgAmvy; 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 F1032606A320; Wed, 18 Nov 2026 15:28:43 +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=MzIgAmvy Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4EE181F000C4; Wed, 18 Nov 2026 15:28:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795015723; bh=Y7k0nm5IKFe2UcXuWlpkN5V9iqmYRc2BdLjLVs6XQsw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MzIgAmvybCqtiPB9MEegJ0jMTs1mOaj38YmC6nS+DaC1USizC8ySzNKEtF9tW0qd1 cuHkxZUKNqmQkkh07oaBAFOHxoKusb1u9gautMkPk+QkAH6eXpdG5JLY3xnRfupJgA sMgoEInE6HYSeL9Em0Efx6DDM1A5EqbY+CQhq1E0= 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 7.3 0275/2651] ASoC: mediatek: mt6797: fix wrong unwind order and error code in enable_clock Date: Wed, 18 Nov 2026 15:25:15 +0100 Message-ID: <20261118150257.805610075@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150247.972732815@linuxfoundation.org> References: <20261118150247.972732815@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.3-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