[PATCH 4/4] ASoC: stm32: sai: clean up probe error path

Johan Hovold posted 4 patches 1 week ago
[PATCH 4/4] ASoC: stm32: sai: clean up probe error path
Posted by Johan Hovold 1 week ago
Use an error label for deregistering also the PCM DMA for consistency.

Signed-off-by: Johan Hovold <johan@kernel.org>
---
 sound/soc/stm/stm32_sai_sub.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c
index 5ae4d2577f28..450e1585edee 100644
--- a/sound/soc/stm/stm32_sai_sub.c
+++ b/sound/soc/stm/stm32_sai_sub.c
@@ -1716,15 +1716,15 @@ static int stm32_sai_sub_probe(struct platform_device *pdev)
 
 	ret = snd_soc_register_component(&pdev->dev, &stm32_component,
 					 &sai->cpu_dai_drv, 1);
-	if (ret) {
-		snd_dmaengine_pcm_unregister(&pdev->dev);
-		goto err_unprepare_pclk;
-	}
+	if (ret)
+		goto err_deregister_pcm_dma;
 
 	pm_runtime_enable(&pdev->dev);
 
 	return 0;
 
+err_deregister_pcm_dma:
+	snd_dmaengine_pcm_unregister(&pdev->dev);
 err_unprepare_pclk:
 	clk_unprepare(sai->pdata->pclk);
 	of_node_put(sai->np_sync_provider);
-- 
2.51.2
Re: [PATCH 4/4] ASoC: stm32: sai: clean up probe error path
Posted by Olivier MOYSAN 6 days, 11 hours ago

On 11/24/25 11:49, Johan Hovold wrote:
> Use an error label for deregistering also the PCM DMA for consistency.
> 
> Signed-off-by: Johan Hovold <johan@kernel.org>

Reviewed-by: olivier moysan <olivier.moysan@foss.st.com>

Olivier

> ---
>   sound/soc/stm/stm32_sai_sub.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c
> index 5ae4d2577f28..450e1585edee 100644
> --- a/sound/soc/stm/stm32_sai_sub.c
> +++ b/sound/soc/stm/stm32_sai_sub.c
> @@ -1716,15 +1716,15 @@ static int stm32_sai_sub_probe(struct platform_device *pdev)
>   
>   	ret = snd_soc_register_component(&pdev->dev, &stm32_component,
>   					 &sai->cpu_dai_drv, 1);
> -	if (ret) {
> -		snd_dmaengine_pcm_unregister(&pdev->dev);
> -		goto err_unprepare_pclk;
> -	}
> +	if (ret)
> +		goto err_deregister_pcm_dma;
>   
>   	pm_runtime_enable(&pdev->dev);
>   
>   	return 0;
>   
> +err_deregister_pcm_dma:
> +	snd_dmaengine_pcm_unregister(&pdev->dev);
>   err_unprepare_pclk:
>   	clk_unprepare(sai->pdata->pclk);
>   	of_node_put(sai->np_sync_provider);