From: phucduc.bui@gmail.com
To: Mark Brown <broonie@kernel.org>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>,
Trevor Wu <trevor.wu@mediatek.com>,
Ajay Kumar Nandam <ajay.nandam@oss.qualcomm.com>
Cc: Liam Girdwood <lgirdwood@gmail.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
cassiogabrielcontato@gmail.com,
Mukesh Ojha <mukesh.ojha@oss.qualcomm.com>,
Liviu Dudau <liviu.dudau@arm.com>,
Haotian Zhang <vulab@iscas.ac.cn>,
HariKrishna Sagala <hariconscious@gmail.com>,
linux-sound@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org,
bui duc phuc <phucduc.bui@gmail.com>
Subject: [PATCH v3 05/16] ASoC: mediatek: mt8195: Fix main clock error handling
Date: Wed, 14 Oct 2026 18:27:40 +0700 [thread overview]
Message-ID: <20261014112752.683032-6-phucduc.bui@gmail.com> (raw)
In-Reply-To: <20261014112752.683032-1-phucduc.bui@gmail.com>
From: bui duc phuc <phucduc.bui@gmail.com>
Check the return values of clock enable functions and propagate
errors to the caller.
Disable previously enabled clocks on failure to match the
main clock disable sequence.
Fixes: 6746cc858259 ("ASoC: mediatek: mt8195: add platform driver")
Signed-off-by: bui duc phuc <phucduc.bui@gmail.com>
---
sound/soc/mediatek/mt8195/mt8195-afe-clk.c | 23 +++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/sound/soc/mediatek/mt8195/mt8195-afe-clk.c b/sound/soc/mediatek/mt8195/mt8195-afe-clk.c
index 03d2c4fd1f85..44cddc2b1564 100644
--- a/sound/soc/mediatek/mt8195/mt8195-afe-clk.c
+++ b/sound/soc/mediatek/mt8195/mt8195-afe-clk.c
@@ -716,14 +716,31 @@ static int mt8195_afe_disable_timing_sys(struct mtk_base_afe *afe)
int mt8195_afe_enable_main_clock(struct mtk_base_afe *afe)
{
- mt8195_afe_enable_timing_sys(afe);
+ int ret;
+
+ ret = mt8195_afe_enable_timing_sys(afe);
+ if (ret)
+ return ret;
mt8195_afe_enable_afe_on(afe);
- mt8195_afe_enable_apll_tuner(afe, MT8195_AUD_PLL1);
- mt8195_afe_enable_apll_tuner(afe, MT8195_AUD_PLL2);
+ ret = mt8195_afe_enable_apll_tuner(afe, MT8195_AUD_PLL1);
+ if (ret)
+ goto err_disable_afe_on;
+
+ ret = mt8195_afe_enable_apll_tuner(afe, MT8195_AUD_PLL2);
+ if (ret)
+ goto err_disable_apll1_tuner;
return 0;
+
+err_disable_apll1_tuner:
+ mt8195_afe_disable_apll_tuner(afe, MT8195_AUD_PLL1);
+err_disable_afe_on:
+ mt8195_afe_disable_afe_on(afe);
+ mt8195_afe_disable_timing_sys(afe);
+
+ return ret;
}
int mt8195_afe_disable_main_clock(struct mtk_base_afe *afe)
--
2.43.0
next prev parent reply other threads:[~2026-10-14 11:28 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-14 11:27 [PATCH v3 00/16] ASoC: mediatek: mt8195: Fix clock error handling phucduc.bui
2026-10-14 11:27 ` [PATCH v3 01/16] ASoC: mediatek: mt8195: Fix tuner " phucduc.bui
2026-10-14 11:27 ` [PATCH v3 02/16] ASoC: mediatek: mt8195: Use dev_err_probe() in mt8195_afe_init_clock() phucduc.bui
2026-10-14 11:27 ` [PATCH v3 03/16] ASoC: mediatek: mt8195: Fix register access clock error handling phucduc.bui
2026-10-14 11:27 ` [PATCH v3 04/16] ASoC: mediatek: mt8195: Fix timing system " phucduc.bui
2026-10-14 11:27 ` phucduc.bui [this message]
2026-10-14 11:27 ` [PATCH v3 06/16] ASoC: mediatek: mt8195: Fix paired memif " phucduc.bui
2026-10-14 11:27 ` [PATCH v3 07/16] ASoC: mediatek: mt8195: Fix FE startup " phucduc.bui
2026-10-14 11:27 ` [PATCH v3 08/16] ASoC: mediatek: mt8195: Check paired MEMIF clock enable in FE trigger phucduc.bui
2026-10-14 11:27 ` [PATCH v3 09/16] ASoC: mediatek: mt8195: Fix runtime resume error handling phucduc.bui
2026-10-14 11:27 ` [PATCH v3 10/16] ASoC: mediatek: mt8195: Remove redundant error message phucduc.bui
2026-10-14 11:27 ` [PATCH v3 11/16] ASoC: mediatek: mt8195: Propagate IRQ lookup errors phucduc.bui
2026-10-14 11:27 ` [PATCH v3 12/16] ASoC: mediatek: mt8195: Fix ETDM MCLK error handling phucduc.bui
2026-10-14 11:27 ` [PATCH v3 13/16] ASoC: mediatek: mt8195: Fix ETDM startup " phucduc.bui
2026-10-14 11:27 ` [PATCH v3 14/16] ASoC: mediatek: mt8195: Fix HDMI TX " phucduc.bui
2026-10-14 11:27 ` [PATCH v3 15/16] ASoC: mediatek: mt8195: Fix ETDM probe " phucduc.bui
2026-10-14 11:27 ` [PATCH v3 16/16] ASoC: mediatek: mt8195: Fix clock parent " phucduc.bui
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261014112752.683032-6-phucduc.bui@gmail.com \
--to=phucduc.bui@gmail.com \
--cc=ajay.nandam@oss.qualcomm.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=broonie@kernel.org \
--cc=cassiogabrielcontato@gmail.com \
--cc=hariconscious@gmail.com \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-sound@vger.kernel.org \
--cc=liviu.dudau@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=mukesh.ojha@oss.qualcomm.com \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
--cc=trevor.wu@mediatek.com \
--cc=vulab@iscas.ac.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox