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=1795023201; b=nRhBas8vgtn7uHEqkR8q9XUtcSHKHAJo3wJhxCQU3dewnrtzuuwE9dHlQnpFuASOXoi2 6rnNTJraJwpQ1WVSYcyzdZOH1hDFGO68d/SowbxoAruI2D+2evqkLlRj84mFD+PhNXfoM y3dxTSKQISvTJPABI0ifKvkZQeQep4tRRCNtq2XO22y4FbHSuTXDdzVgQ+6+OGmeLYiLV pxAC+jWSJCQbJg2X/CJ1QUHd5uZWqyzE/X1bWyoir4GBTUKBp3NI3vzLt2nz0WRmt43Oo RoJkLS4D3LosdtmZ74JPw8cD1Ind7LSeOZuXyxDw5KUdH7RhuxxxNokx6Von/4P1L0Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795023201; 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=k7zfzH83l703afT7T2nAxFOUGnf/6jVtiftFzbjV/PQ=; b=obQAPFX3LYX56jdMRHEUEbjlCZLmpEEfYOhg5N7bMIi7cFVEwNliuAmqchyUS+kr2L5i 8NoVFu8oJ82yTsdr7+w8XjVm+S1bIRvCJbyYuE3d+oNONhfO+HHZAY+fG9EHZsAgiI18P gXh+XWfYYC0I+I2qrIzilBq6r3nSiDrs2O8hTQ8EDo2Cd1XMtEHnv1KyCo9Hy43YjCeD7 kpGP63cxnxjR9oZ/FE8LlwJAxa0r9lKq6QwfelBEARZsuSpYlNZdMCHkWSA1iLn+60UvQ BS9IZ63kKUhIWsnrsuuZj9yeAVodki/J8MhRyo61XGZhqZpdT9kHXQwS3aAzDWMmTWQ== 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=0EN1nOEY; 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 4ACF5606A335; Wed, 18 Nov 2026 17:33: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=0EN1nOEY Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9DC1D1F000C5; Wed, 18 Nov 2026 17:33:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795023201; bh=k7zfzH83l703afT7T2nAxFOUGnf/6jVtiftFzbjV/PQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=0EN1nOEYoRnhdOgrHDBNkw8aOk/URwGElczyNLnMlVj0sL66ei+ol6JVLypYEhFOB 8RWZL6TlHRCfeWRqbdVL2daHhvS0swUqK9mWqs1exLoxGeLE0zeInE5jU7QLYt+J// kiWlOHMwm/1ZDFyy6hp1tSwtMEEemDAzfMHkgHAw= 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.18 0283/2151] ASoC: mediatek: mt6797: fix wrong unwind order and error code in enable_clock Date: Wed, 18 Nov 2026 15:33:38 +0100 Message-ID: <20261118150132.201239665@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@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 6.18-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