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=1795029190; b=SZ0THMOunvffhpqWx1iuLVnLuf0Ashs/lI/KjtPLoKgMQoOXafkbTMynD9vwHJuBUORt XqLCcdGtvvUrc1nj12Mkcm4wi9J80ZWRQEs9r9KnfOHQSzct2kzyXi2dKxZIfn+r/AksS yTXRBKAxmVL0Jb00GX3JB2+ynLkAyqv6DN1mOEuuFLsF0r8LrJn2w7weB6nezMhb4F7Lr b0rTbejQL3G2f3vzQ7S4B/v7V0Cc2hHDplpXxXzET0KhUpCRJbWAt4PFsonSVyodFEFLV N6Czvv+LQCvt6/nFRsjZocRWtUjV2WvOzFi3UdPe8JL1ICz7d0VsShpHgmy5Qdqntrg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795029190; 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=smFJmjwhvxvDqaibAj7qW2tAPaKBnF2c+GSo7TGk1lI=; b=x5wQ4VoMYiPMIsaOM1FIObuFEw+FKPy2Tf5z5UhYSkNHDhnEbONln4UXf0KfHrcKH0/d O628BnI1jFDVZpzEOTHEMeFzN/NAIOtqAykDaaDDTHXQWpU6ANhDy6a5ljBhrZWnlXrJV IEFpGlxBhAJup8N6JuS2hXgAhL5CuzBAwJb4yNuVtT3h30BvKJNq8Kq6Eg972aUudV/bv /FSHF9QdkTnqY3wIgBtE76Ri03uBG8rSo+Bv1hdRfly5BeVK1UFut4WzE3easbfHuq+Y4 WufivzSVYdfvxNnOAgQ0LQUet4Aa+0xHpm7WFAJnMIdMivhX1l95nPffzxQF54z1Oow== 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=leUP7zIH; 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 32AD5606A31C; Wed, 18 Nov 2026 19:13:10 +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=leUP7zIH Received: by smtp.kernel.org (Postfix) with ESMTPSA id 86E901F000C4; Wed, 18 Nov 2026 19:13:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795029190; bh=smFJmjwhvxvDqaibAj7qW2tAPaKBnF2c+GSo7TGk1lI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=leUP7zIHHNqpPbSVG+3L1cjBD830HkseKWbDwK3bo3B+S4clDHK8O+f3Bzzw338xc IUJChZNVgaK7dC4PtQrxom0S3T4WvwAaSYuN13w7M7kaVgHmhBCZ/oOIR3KHieTpMP HBZ11z1dK/VS0UYw8xl1KQAgUt/Arc2w6IvJueT8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, bui duc phuc , Mark Brown , Sasha Levin Subject: [PATCH 6.12 0260/1756] ASoC: mediatek: mt8186: Fix AFE clock error handling Date: Wed, 18 Nov 2026 15:39:47 +0100 Message-ID: <20261118150018.714895186@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 eb72060a1966baf9a6ed753186621ee6e39dc889 ] The error paths in mt8186_afe_enable_clock() do not consistently undo the clock operations performed before an error. Fix the goto targets and cleanup order so that the audio internal bus parent is restored to CLK26M and all previously enabled clocks are disabled before returning the error. Fixes: 55b423d5623c ("ASoC: mediatek: mt8186: support audio clock control in platform driver") Signed-off-by: bui duc phuc Link: https://patch.msgid.link/20260903051150.178057-4-phucduc.bui@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/mediatek/mt8186/mt8186-afe-clk.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/sound/soc/mediatek/mt8186/mt8186-afe-clk.c b/sound/soc/mediatek/mt8186/mt8186-afe-clk.c index effc4193e63ea..13781d5ca5444 100644 --- a/sound/soc/mediatek/mt8186/mt8186-afe-clk.c +++ b/sound/soc/mediatek/mt8186/mt8186-afe-clk.c @@ -288,7 +288,7 @@ int mt8186_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 clk_mux_audio_err; + goto clk_mux_audio_intbus_err; } ret = clk_prepare_enable(afe_priv->clk[CLK_MUX_AUDIOINTBUS]); @@ -315,24 +315,22 @@ int mt8186_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_AFE], ret); - goto clk_afe_err; + goto clk_mux_audio_h_parent_err; } return 0; -clk_afe_err: - clk_disable_unprepare(afe_priv->clk[CLK_AFE]); clk_mux_audio_h_parent_err: -clk_mux_audio_intbus_parent_err: mt8186_set_audio_int_bus_parent(afe, CLK_CLK26M); -clk_mux_audio_intbus_err: +clk_mux_audio_intbus_parent_err: clk_disable_unprepare(afe_priv->clk[CLK_MUX_AUDIOINTBUS]); -clk_mux_audio_err: +clk_mux_audio_intbus_err: clk_disable_unprepare(afe_priv->clk[CLK_MUX_AUDIO]); -clk_infra_sys_audio_err: - clk_disable_unprepare(afe_priv->clk[CLK_INFRA_SYS_AUDIO]); -clk_infra_audio_26m_err: +clk_mux_audio_err: clk_disable_unprepare(afe_priv->clk[CLK_INFRA_AUDIO_26M]); +clk_infra_audio_26m_err: + clk_disable_unprepare(afe_priv->clk[CLK_INFRA_SYS_AUDIO]); +clk_infra_sys_audio_err: return ret; } -- 2.53.0