[PATCH 12/14] ASoC: mediatek: mt8195: Fix HDMI TX startup error handling

From: phucduc . bui

Date: Fri Sep 25 2026 - 00:52:48 EST


From: bui duc phuc <phucduc.bui@xxxxxxxxx>

Check and propagate errors when enabling the clock gate and MCLK
during HDMI TX/DP TX startup.

If MCLK enabling fails, disable the clock gate that was already
enabled before returning the error.

Fixes: 1de9a54acafb ("ASoC: mediatek: mt8195: support etdm in platform driver")
Signed-off-by: bui duc phuc <phucduc.bui@xxxxxxxxx>
---
sound/soc/mediatek/mt8195/mt8195-dai-etdm.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c b/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c
index 1270fcac6b3f..11317cdd14ab 100644
--- a/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c
+++ b/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c
@@ -2321,13 +2321,25 @@ static int mtk_dai_hdmitx_dptx_startup(struct snd_pcm_substream *substream,
struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);
struct mt8195_afe_private *afe_priv = afe->platform_priv;
int cg_id = mtk_dai_etdm_get_cg_id_by_dai_id(dai->id);
+ int ret;

- if (cg_id >= 0)
- mt8195_afe_enable_clk(afe, afe_priv->clk[cg_id]);
+ if (cg_id >= 0) {
+ ret = mt8195_afe_enable_clk(afe, afe_priv->clk[cg_id]);
+ if (ret)
+ return ret;
+ }

- mtk_dai_etdm_enable_mclk(afe, dai->id);
+ ret = mtk_dai_etdm_enable_mclk(afe, dai->id);
+ if (ret)
+ goto err_disable_cg_clk;

return 0;
+
+err_disable_cg_clk:
+ if (cg_id >= 0)
+ mt8195_afe_disable_clk(afe, afe_priv->clk[cg_id]);
+
+ return ret;
}

static void mtk_dai_hdmitx_dptx_shutdown(struct snd_pcm_substream *substream,
--
2.43.0