ASoC: mediatek: mt6797: Fix error handling
Subsystems (3)
v3 cover ASoC: mediatek: mt6797: Fix error handling
From: bui duc phuc <[email protected]>
Hi all,
This series fixes and cleans up error handling in the MT6797 ASoC driver.
Compile tested only.
Changes in v2:
- Update the subject prefix from ASoC: mt6797: to ASoC: mediatek: mt6797:.
Changes in v3:
- Add a cover letter.
- Add Fixes tags.
- Add Reviewed-by tags.
Thanks,
Phuc
bui duc phuc (3):
ASoC: mediatek: mt6797: fix wrong unwind order and error code in
enable_clock
ASoC: mediatek: mt6797: Use dev_err_probe() for error handling
ASoC: mediatek: mt6797: Drop redundant probe error messages
sound/soc/mediatek/mt6797/mt6797-afe-clk.c | 23 +++++++++------------- sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 8 ++------ 2 files changed, 11 insertions(+), 20 deletions(-)
Signature · 1 line
2.43.0
PATCH v3 1/3 ASoC: mediatek: mt6797: fix wrong unwind order and error code in enable_clock
From: bui duc phuc <[email protected]>
The error paths in mt6797_afe_enable_clock() use incorrect goto labels, causing clocks that failed to enable to be disabled during cleanup.
Fix the goto labels to only unwind clocks that were successfully enabled, and return the actual error code.
---
Changes in v2:
- Update the subject prefix from ASoC: mt6797: to ASoC: mediatek: mt6797:.
Changes in v3:
- Add Fixes tags.
- Add Reviewed-by tags.
sound/soc/mediatek/mt6797/mt6797-afe-clk.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
sound/soc/mediatek/mt6797/mt6797-afe-clk.c +6 -8
@@ -63,21 +63,21 @@ int mt6797_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_INFRA_SYS_AUD ], ret); - goto CLK_INFRA_SYS_AUDIO_ERR; +return ret; } ret =clk_prepare_enable (afe_priv->clk[CLK_INFRA_SYS_AUD_26M ]);if (ret) {dev_err (afe->dev,"%s(), clk_prepare_enable %s fail %d\n" , __func__, aud_clks[CLK_INFRA_SYS_AUD_26M ], ret); - goto CLK_INFRA_SYS_AUD_26M_ERR; + goto CLK_INFRA_SYS_AUDIO_ERR; } ret =clk_prepare_enable (afe_priv->clk[CLK_TOP_MUX_AUD ]);if (ret) {dev_err (afe->dev,"%s(), clk_prepare_enable %s fail %d\n" , __func__, aud_clks[CLK_TOP_MUX_AUD ], ret); - goto CLK_MUX_AUDIO_ERR; + goto CLK_INFRA_SYS_AUD_26M_ERR; } ret = clk_set_parent(afe_priv->clk[CLK_TOP_MUX_AUD],
@@ -93,13 +93,11 @@ int mt6797_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_TOP_MUX_AUD_BUS ], ret); - goto CLK_MUX_AUDIO_INTBUS_ERR; + goto CLK_MUX_AUDIO_ERR; } -return ret; +return 0 ; -CLK_MUX_AUDIO_INTBUS_ERR: -clk_disable_unprepare (afe_priv->clk[CLK_TOP_MUX_AUD_BUS ]); CLK_MUX_AUDIO_ERR:clk_disable_unprepare (afe_priv->clk[CLK_TOP_MUX_AUD ]); CLK_INFRA_SYS_AUD_26M_ERR:
@@ -107,7 +105,7 @@ int mt6797_afe_enable_clock(struct mtk_base_afe *afe) CLK_INFRA_SYS_AUDIO_ERR:clk_disable_unprepare (afe_priv->clk[CLK_INFRA_SYS_AUD ]); -return 0 ; +return ret; }int mt6797_afe_disable_clock (struct mtk_base_afe *afe)
Signature · 1 line
2.43.0
PATCH v3 2/3 ASoC: mediatek: mt6797: Use dev_err_probe() for error handling
In reply to [email protected]From: bui duc phuc <[email protected]>
Replace dev_err() with dev_err_probe() to prevent log spam when probe returns -EPROBE_DEFER.
---
Changes in v2:
- Update the subject prefix from ASoC: mt6797: to ASoC: mediatek: mt6797:.
Changes in v3:
- Add Reviewed-by tags.
sound/soc/mediatek/mt6797/mt6797-afe-clk.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
sound/soc/mediatek/mt6797/mt6797-afe-clk.c +3 -6
@@ -43,12 +43,9 @@ int mt6797_init_clock(struct mtk_base_afe *afe)for (i =0 ; i <CLK_NUM ; i++) { afe_priv->clk[i] =devm_clk_get (afe->dev, aud_clks[i]); -if (IS_ERR (afe_priv->clk[i])) { -dev_err (afe->dev,"%s(), devm_clk_get %s fail, ret %ld\n" , - __func__, aud_clks[i], -PTR_ERR (afe_priv->clk[i])); -return PTR_ERR (afe_priv->clk[i]); - } +if (IS_ERR (afe_priv->clk[i])) +return dev_err_probe (afe->dev,PTR_ERR (afe_priv->clk[i]), +"failed to get clock %s\n" , aud_clks[i]); }return 0 ;
Signature · 1 line
2.43.0
PATCH v3 3/3 ASoC: mediatek: mt6797: Drop redundant probe error messages
In reply to [email protected]From: bui duc phuc <[email protected]>
The errors handled here are already reported by the called functions, either directly or deeper in the call chain. Therefore, the additional dev_err() calls are redundant and can be removed.
---
Changes in v2:
- Update the subject prefix from ASoC: mt6797: to ASoC: mediatek: mt6797:.
Changes in v3:
- Add Reviewed-by tags.
sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
sound/soc/mediatek/mt6797/mt6797-afe-pcm.c +2 -6
@@ -754,10 +754,8 @@ static int mt6797_afe_pcm_dev_probe(struct platform_device *pdev)/* initial audio related clock */ ret =mt6797_init_clock (afe); -if (ret) { -dev_err (dev,"init clock error\n" ); +if (ret)return ret; - }/* regmap init */ afe->base_addr =devm_platform_ioremap_resource (pdev,0 );
@@ -800,10 +798,8 @@ static int mt6797_afe_pcm_dev_probe(struct platform_device *pdev) ret =devm_request_irq (dev, irq_id, mt6797_afe_irq_handler,IRQF_TRIGGER_NONE ,"asys-isr" , (void *)afe); -if (ret) { -dev_err (dev,"could not request_irq for asys-isr\n" ); +if (ret)return ret; - }/* init sub_dais */ INIT_LIST_HEAD (&afe->sub_dais);
Signature · 1 line
2.43.0
Mark Brown
maintainerQuoted 9 lines · On Fri, 21 Aug 2026 19:28:37 +0700, [email protected] wrote:
ASoC: mediatek: mt6797: Fix error handling
From: bui duc phuc <[email protected]>
Hi all,
This series fixes and cleans up error handling in the MT6797 ASoC driver.
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.4
Thanks!
[1/3] ASoC: mediatek: mt6797: fix wrong unwind order and error code in enable_clock
https://git.kernel.org/broonie/sound/c/e967d479b65c [2/3] ASoC: mediatek: mt6797: Use dev_err_probe() for error handling https://git.kernel.org/broonie/sound/c/2e4b0d5f52da [3/3] ASoC: mediatek: mt6797: Drop redundant probe error messages https://git.kernel.org/broonie/sound/c/1e5e1344b36e
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark