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=1795056441; b=HcAUAV4zghja8/vpUt652Yk1VCzn/oOIimCow24DihTvOcn3JiE5WvfTQTwabsjIERxK sfuBgFJDmwwPSUoH1c/pIow2VgH9xqqNVGTB02d3iy+NsMIAHUT42979UbdHXDYTZRPPv bCogz+7UZIHWGVDXEOJWP1ZlUg9Kr6cofR0qlH+Cgz3Js6/OiIJM8TrcLLy+bER72qQZv IXqnLdBRB1tHLSOdy+fNt+3u1x1xDq9CgUvJvjmDZgg4qKnHJRQSZ0tFmI5CYiMQTtHUa p3bWUnSlqrqlVjONxViOIKqq9+7fO2r6rGdeYZOejtyRNvmLoK0A5WXDnGhDb+VhVaw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795056441; 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=TrPBbJ5Av9Iv9MpjVz/Td7hnIMGYMQ9CBvuaHXvR/Aw=; b=ceJ39oJRUsbXMLo4U4d2bX6lmoT+Y5pMj82/cbGKRHhoXzU7VFQ3EkpVlgebmRT5hIbk Sgzqagm1wTKxJTVjQ7B25zcadgDnwMCeASGx88NadiDMwi5FJVpoYr2pM8xk+fBBAQyIM f04KNOLefKNPAPxVySmJoYxl8cpbxg28PUmFeSIbwhDPAeIxa2WM5yKN9LyJNcq+vBfuk LWVY7ZHYBKDAVmNYy5Vbcglo7YxVbJhOccpHHk9YA3xAMctx1TcTfgMw+hst7B9vMgCFd qLzRH6hBwMNIQTE5gzy/zot4aHlsfnZX8jbrvAkF+jfv9XRWkvilFqEDkDFuu+GQF/g== 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=ytnjUfFM; 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 151F2606A31C; Thu, 19 Nov 2026 02:47: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=ytnjUfFM Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E4F51F000C4; Thu, 19 Nov 2026 02:47:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795056440; bh=TrPBbJ5Av9Iv9MpjVz/Td7hnIMGYMQ9CBvuaHXvR/Aw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ytnjUfFM+F4QPykFeumJbe77AHrq62p44mllskswgJCARO0QTTbKUcSdQ84clT4m7 uI4s7XTW9RB3BLpQjjOHj0buFuXz36zxHygF+jr/Y1uNvosjHiv4N4NRiMaTqpz/ZJ mL7YVJGpnd/uc+nld9rZnGFptCZLYlipn/Nx65iI= 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 5.15 1987/2214] ASoC: mediatek: mt8195: Fix paired memif clock error handling Date: Wed, 18 Nov 2026 16:01:03 +0100 Message-ID: <20261118150130.330120610@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@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.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: bui duc phuc [ Upstream commit c0ec135cf3fd7c7c7cdefd234111e5d4f069a7e6 ] Check and propagate errors when preparing and enabling the paired DL8/DL10 memif clocks. If enabling the second clock fails, undo the clock that was already prepared or enabled to keep the clock state balanced. Fixes: 6746cc858259 ("ASoC: mediatek: mt8195: add platform driver") Signed-off-by: bui duc phuc Link: https://patch.msgid.link/20261014112752.683032-7-phucduc.bui@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 24 ++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c b/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c index 2e06316ff830c..b5ebc86ee8843 100644 --- a/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c +++ b/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c @@ -284,15 +284,23 @@ mt8195_afe_paired_memif_clk_prepare(struct snd_pcm_substream *substream, struct mt8195_afe_private *afe_priv = afe->platform_priv; int id = asoc_rtd_to_cpu(rtd, 0)->id; int clk_id; + int ret; if (id != MT8195_AFE_MEMIF_DL8 && id != MT8195_AFE_MEMIF_DL10) return 0; if (enable) { clk_id = MT8195_CLK_AUD_MEMIF_DL10; - mt8195_afe_prepare_clk(afe, afe_priv->clk[clk_id]); + ret = mt8195_afe_prepare_clk(afe, afe_priv->clk[clk_id]); + if (ret) + return ret; clk_id = MT8195_CLK_AUD_MEMIF_DL8; - mt8195_afe_prepare_clk(afe, afe_priv->clk[clk_id]); + ret = mt8195_afe_prepare_clk(afe, afe_priv->clk[clk_id]); + if (ret) { + clk_id = MT8195_CLK_AUD_MEMIF_DL10; + mt8195_afe_unprepare_clk(afe, afe_priv->clk[clk_id]); + return ret; + } } else { clk_id = MT8195_CLK_AUD_MEMIF_DL8; mt8195_afe_unprepare_clk(afe, afe_priv->clk[clk_id]); @@ -313,6 +321,7 @@ mt8195_afe_paired_memif_clk_enable(struct snd_pcm_substream *substream, struct mt8195_afe_private *afe_priv = afe->platform_priv; int id = asoc_rtd_to_cpu(rtd, 0)->id; int clk_id; + int ret; if (id != MT8195_AFE_MEMIF_DL8 && id != MT8195_AFE_MEMIF_DL10) return 0; @@ -320,11 +329,18 @@ mt8195_afe_paired_memif_clk_enable(struct snd_pcm_substream *substream, if (enable) { /* DL8_DL10_MEM */ clk_id = MT8195_CLK_AUD_MEMIF_DL10; - mt8195_afe_enable_clk_atomic(afe, afe_priv->clk[clk_id]); + ret = mt8195_afe_enable_clk_atomic(afe, afe_priv->clk[clk_id]); + if (ret) + return ret; udelay(1); /* DL8_DL10_AGENT */ clk_id = MT8195_CLK_AUD_MEMIF_DL8; - mt8195_afe_enable_clk_atomic(afe, afe_priv->clk[clk_id]); + ret = mt8195_afe_enable_clk_atomic(afe, afe_priv->clk[clk_id]); + if (ret) { + clk_id = MT8195_CLK_AUD_MEMIF_DL10; + mt8195_afe_disable_clk_atomic(afe, afe_priv->clk[clk_id]); + return ret; + } } else { /* DL8_DL10_AGENT */ clk_id = MT8195_CLK_AUD_MEMIF_DL8; -- 2.53.0