[PATCH v2 11/14] ASoC: mediatek: mt8195: Fix ETDM startup error handling

[Ajay Kumar Nandam]

On 10/5/2026 4:32 PM, phucduc.bui at gmail.com wrote:
> From: bui duc phuc <phucduc.bui at gmail.com>
> 
> Check and propagate errors when enabling the ETDM MCLK and clock
> gates during startup.
> 
> If enabling a clock fails, disable the clocks that were already
> enabled to keep the clock state balanced.
> 
> Fixes: 1de9a54acafb ("ASoC: mediatek: mt8195: support etdm in platform driver")
> Signed-off-by: bui duc phuc <phucduc.bui at gmail.com>

LGTM

Reviewed-by: Ajay Kumar Nandam <ajay.nandam at oss.qualcomm.com>
> ---
>   sound/soc/mediatek/mt8195/mt8195-dai-etdm.c | 50 ++++++++++++++++-----
>   1 file changed, 40 insertions(+), 10 deletions(-)
> 
> diff --git a/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c b/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c
> index fba51c552eec..1270fcac6b3f 100644
> --- a/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c
> +++ b/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c
> @@ -1575,36 +1575,66 @@ static int mtk_dai_etdm_startup(struct snd_pcm_substream *substream,
>   	int cg_id;
>   	int mst_dai_id;
>   	int slv_dai_id;
> -	int i;
> +	int i, ret;
>   
>   	if (is_cowork_mode(dai)) {
>   		mst_dai_id = get_etdm_cowork_master_id(dai);
>   		if (!mt8195_afe_etdm_is_valid(mst_dai_id))
>   			return -EINVAL;
>   
> -		mtk_dai_etdm_enable_mclk(afe, mst_dai_id);
> +		ret = mtk_dai_etdm_enable_mclk(afe, mst_dai_id);
> +		if (ret)
> +			return ret;
>   		cg_id = mtk_dai_etdm_get_cg_id_by_dai_id(mst_dai_id);
> -		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)
> +				goto err_disable_mclk;
> +		}
>   
>   		mst_etdm_data = afe_priv->dai_priv[mst_dai_id];
>   
>   		for (i = 0; i < mst_etdm_data->cowork_slv_count; i++) {
>   			slv_dai_id = mst_etdm_data->cowork_slv_id[i];
>   			cg_id = mtk_dai_etdm_get_cg_id_by_dai_id(slv_dai_id);
> -			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)
> +					goto err_disable_slv_clk;
> +			}
>   		}
>   	} else {
> -		mtk_dai_etdm_enable_mclk(afe, dai->id);
> +		ret = mtk_dai_etdm_enable_mclk(afe, dai->id);
> +		if (ret)
> +			return ret;
>   
>   		cg_id = mtk_dai_etdm_get_cg_id_by_dai_id(dai->id);
> -		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)
> +				goto err_disable_mclk;
> +		}
>   	}
>   
>   	return 0;
> +
> +err_disable_slv_clk:
> +	while (--i >= 0) {
> +		slv_dai_id = mst_etdm_data->cowork_slv_id[i];
> +		cg_id = mtk_dai_etdm_get_cg_id_by_dai_id(slv_dai_id);
> +		if (cg_id >= 0)
> +			mt8195_afe_disable_clk(afe, afe_priv->clk[cg_id]);
> +	}
> +
> +	cg_id = mtk_dai_etdm_get_cg_id_by_dai_id(mst_dai_id);
> +	if (cg_id >= 0)
> +		mt8195_afe_disable_clk(afe, afe_priv->clk[cg_id]);
> +
> +err_disable_mclk:
> +	mtk_dai_etdm_disable_mclk(afe, is_cowork_mode(dai) ? mst_dai_id : dai->id);
> +
> +	return ret;
>   }
>   
>   static void mtk_dai_etdm_shutdown(struct snd_pcm_substream *substream,