FAILED: patch "[PATCH] ASoC: stm32: sai: fix clk prepare imbalance on probe failure" failed to apply to 5.15-stable tree
Subsystems (5)
[email protected]
maintainerThe patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 312ec2f0d9d1a5656f76d770bbf1d967e9289aa7
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026010531-vendor-unissued-6b5a@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 312ec2f0d9d1a5656f76d770bbf1d967e9289aa7 Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Mon, 24 Nov 2025 11:49:06 +0100
Subject: [PATCH] ASoC: stm32: sai: fix clk prepare imbalance on probe failure
Make sure to unprepare the parent clock also on probe failures (e.g. probe deferral).
sound/soc/stm/stm32_sai_sub.c +21 -7
@@ -1634,14 +1634,21 @@ static int stm32_sai_sub_parse_of(struct platform_device *pdev,if (of_property_present (np,"#clock-cells" )) { ret =stm32_sai_add_mclk_provider (sai);if (ret <0 ) -return ret; + goto err_unprepare_pclk; }else { sai->sai_mclk =devm_clk_get_optional (&pdev->dev,"MCLK" ); -if (IS_ERR (sai->sai_mclk)) -return PTR_ERR (sai->sai_mclk); +if (IS_ERR (sai->sai_mclk)) { + ret =PTR_ERR (sai->sai_mclk); + goto err_unprepare_pclk; + } }return 0 ; + +err_unprepare_pclk: +clk_unprepare (sai->pdata->pclk); + +return ret; }static int stm32_sai_sub_probe (struct platform_device *pdev)
@@ -1688,26 +1695,33 @@ static int stm32_sai_sub_probe(struct platform_device *pdev) IRQF_SHARED, dev_name(&pdev->dev), sai);if (ret) {dev_err (&pdev->dev,"IRQ request returned %d\n" , ret); -return ret; + goto err_unprepare_pclk; }if (STM_SAI_PROTOCOL_IS_SPDIF (sai)) conf = &stm32_sai_pcm_config_spdif; ret =snd_dmaengine_pcm_register (&pdev->dev, conf,0 ); -if (ret) -return dev_err_probe (&pdev->dev, ret,"Could not register pcm dma\n" ); +if (ret) { + ret =dev_err_probe (&pdev->dev, ret,"Could not register pcm dma\n" ); + goto err_unprepare_pclk; + } ret =snd_soc_register_component (&pdev->dev, &stm32_component, &sai->cpu_dai_drv,1 );if (ret) {snd_dmaengine_pcm_unregister (&pdev->dev); -return ret; + goto err_unprepare_pclk; }pm_runtime_enable (&pdev->dev);return 0 ; + +err_unprepare_pclk: +clk_unprepare (sai->pdata->pclk); + +return ret; }static void stm32_sai_sub_remove (struct platform_device *pdev)
Sasha Levin
maintainerPATCH 1/3 ASoC: stm: Use dev_err_probe() helper
From: Kuninori Morimoto <[email protected]>
[ Upstream commit efc162cbd480f1fb47d439c193ec9731bcc6c749 ]
Use the dev_err_probe() helper, instead of open-coding the same operation.
Stable-dep-of: 312ec2f0d9d1 ("ASoC: stm32: sai: fix clk prepare imbalance on probe failure")
--- sound/soc/stm/stm32_i2s.c | 62 ++++++++++++----------------------- sound/soc/stm/stm32_sai.c | 37 ++++++++------------- sound/soc/stm/stm32_sai_sub.c | 25 +++++--------- sound/soc/stm/stm32_spdifrx.c | 44 +++++++++---------------- 4 files changed, 57 insertions(+), 111 deletions(-)
sound/soc/stm/stm32_i2s.c +21 -41
@@ -1044,36 +1044,24 @@ static int stm32_i2s_parse_dt(struct platform_device *pdev,/* Get clocks */ i2s->pclk =devm_clk_get (&pdev->dev,"pclk" ); -if (IS_ERR (i2s->pclk)) { -if (PTR_ERR (i2s->pclk) != -EPROBE_DEFER ) -dev_err (&pdev->dev,"Could not get pclk: %ld\n" , -PTR_ERR (i2s->pclk)); -return PTR_ERR (i2s->pclk); - } +if (IS_ERR (i2s->pclk)) +return dev_err_probe (&pdev->dev,PTR_ERR (i2s->pclk), +"Could not get pclk\n" ); i2s->i2sclk =devm_clk_get (&pdev->dev,"i2sclk" ); -if (IS_ERR (i2s->i2sclk)) { -if (PTR_ERR (i2s->i2sclk) != -EPROBE_DEFER ) -dev_err (&pdev->dev,"Could not get i2sclk: %ld\n" , -PTR_ERR (i2s->i2sclk)); -return PTR_ERR (i2s->i2sclk); - } +if (IS_ERR (i2s->i2sclk)) +return dev_err_probe (&pdev->dev,PTR_ERR (i2s->i2sclk), +"Could not get i2sclk\n" ); i2s->x8kclk =devm_clk_get (&pdev->dev,"x8k" ); -if (IS_ERR (i2s->x8kclk)) { -if (PTR_ERR (i2s->x8kclk) != -EPROBE_DEFER ) -dev_err (&pdev->dev,"Could not get x8k parent clock: %ld\n" , -PTR_ERR (i2s->x8kclk)); -return PTR_ERR (i2s->x8kclk); - } +if (IS_ERR (i2s->x8kclk)) +return dev_err_probe (&pdev->dev,PTR_ERR (i2s->x8kclk), +"Could not get x8k parent clock\n" ); i2s->x11kclk =devm_clk_get (&pdev->dev,"x11k" ); -if (IS_ERR (i2s->x11kclk)) { -if (PTR_ERR (i2s->x11kclk) != -EPROBE_DEFER ) -dev_err (&pdev->dev,"Could not get x11k parent clock: %ld\n" , -PTR_ERR (i2s->x11kclk)); -return PTR_ERR (i2s->x11kclk); - } +if (IS_ERR (i2s->x11kclk)) +return dev_err_probe (&pdev->dev,PTR_ERR (i2s->x11kclk), +"Could not get x11k parent clock\n" );/* Register mclk provider if requested */ if (of_find_property (np,"#clock-cells" ,NULL )) {
@@ -1096,12 +1084,10 @@ static int stm32_i2s_parse_dt(struct platform_device *pdev,/* Reset */ rst =devm_reset_control_get_optional_exclusive (&pdev->dev,NULL ); -if (IS_ERR (rst)) { -if (PTR_ERR (rst) != -EPROBE_DEFER ) -dev_err (&pdev->dev,"Reset controller error %ld\n" , -PTR_ERR (rst)); -return PTR_ERR (rst); - } +if (IS_ERR (rst)) +return dev_err_probe (&pdev->dev,PTR_ERR (rst), +"Reset controller error\n" ); +reset_control_assert (rst);udelay (2 );reset_control_deassert (rst);
@@ -1143,19 +1129,13 @@ static int stm32_i2s_probe(struct platform_device *pdev) i2s->regmap =devm_regmap_init_mmio_clk (&pdev->dev,"pclk" , i2s->base, i2s->regmap_conf); -if (IS_ERR (i2s->regmap)) { -if (PTR_ERR (i2s->regmap) != -EPROBE_DEFER ) -dev_err (&pdev->dev,"Regmap init error %ld\n" , -PTR_ERR (i2s->regmap)); -return PTR_ERR (i2s->regmap); - } +if (IS_ERR (i2s->regmap)) +return dev_err_probe (&pdev->dev,PTR_ERR (i2s->regmap), +"Regmap init error\n" ); ret =snd_dmaengine_pcm_register (&pdev->dev, &stm32_i2s_pcm_config,0 ); -if (ret) { -if (ret != -EPROBE_DEFER ) -dev_err (&pdev->dev,"PCM DMA register error %d\n" , ret); -return ret; - } +if (ret) +return dev_err_probe (&pdev->dev, ret,"PCM DMA register error\n" ); ret =snd_soc_register_component (&pdev->dev, &stm32_i2s_component, i2s->dai_drv,1 );
sound/soc/stm/stm32_sai.c +13 -24
@@ -173,29 +173,20 @@ static int stm32_sai_probe(struct platform_device *pdev)if (!STM_SAI_IS_F4 (sai)) { sai->pclk =devm_clk_get (&pdev->dev,"pclk" ); -if (IS_ERR (sai->pclk)) { -if (PTR_ERR (sai->pclk) != -EPROBE_DEFER ) -dev_err (&pdev->dev,"missing bus clock pclk: %ld\n" , -PTR_ERR (sai->pclk)); -return PTR_ERR (sai->pclk); - } +if (IS_ERR (sai->pclk)) +return dev_err_probe (&pdev->dev,PTR_ERR (sai->pclk), +"missing bus clock pclk\n" ); } sai->clk_x8k =devm_clk_get (&pdev->dev,"x8k" ); -if (IS_ERR (sai->clk_x8k)) { -if (PTR_ERR (sai->clk_x8k) != -EPROBE_DEFER ) -dev_err (&pdev->dev,"missing x8k parent clock: %ld\n" , -PTR_ERR (sai->clk_x8k)); -return PTR_ERR (sai->clk_x8k); - } +if (IS_ERR (sai->clk_x8k)) +return dev_err_probe (&pdev->dev,PTR_ERR (sai->clk_x8k), +"missing x8k parent clock\n" ); sai->clk_x11k =devm_clk_get (&pdev->dev,"x11k" ); -if (IS_ERR (sai->clk_x11k)) { -if (PTR_ERR (sai->clk_x11k) != -EPROBE_DEFER ) -dev_err (&pdev->dev,"missing x11k parent clock: %ld\n" , -PTR_ERR (sai->clk_x11k)); -return PTR_ERR (sai->clk_x11k); - } +if (IS_ERR (sai->clk_x11k)) +return dev_err_probe (&pdev->dev,PTR_ERR (sai->clk_x11k), +"missing x11k parent clock\n" );/* init irqs */ sai->irq =platform_get_irq (pdev,0 );
@@ -204,12 +195,10 @@ static int stm32_sai_probe(struct platform_device *pdev)/* reset */ rst =devm_reset_control_get_optional_exclusive (&pdev->dev,NULL ); -if (IS_ERR (rst)) { -if (PTR_ERR (rst) != -EPROBE_DEFER ) -dev_err (&pdev->dev,"Reset controller error %ld\n" , -PTR_ERR (rst)); -return PTR_ERR (rst); - } +if (IS_ERR (rst)) +return dev_err_probe (&pdev->dev,PTR_ERR (rst), +"Reset controller error\n" ); +reset_control_assert (rst);udelay (2 );reset_control_deassert (rst);
sound/soc/stm/stm32_sai_sub.c +8 -17
@@ -1379,12 +1379,9 @@ static int stm32_sai_sub_parse_of(struct platform_device *pdev,*/ sai->regmap =devm_regmap_init_mmio (&pdev->dev, base, sai->regmap_config); -if (IS_ERR (sai->regmap)) { -if (PTR_ERR (sai->regmap) != -EPROBE_DEFER ) -dev_err (&pdev->dev,"Regmap init error %ld\n" , -PTR_ERR (sai->regmap)); -return PTR_ERR (sai->regmap); - } +if (IS_ERR (sai->regmap)) +return dev_err_probe (&pdev->dev,PTR_ERR (sai->regmap), +"Regmap init error\n" );/* Get direction property */ if (of_property_match_string (np,"dma-names" ,"tx" ) >=0 ) {
@@ -1472,12 +1469,9 @@ static int stm32_sai_sub_parse_of(struct platform_device *pdev,of_node_put (args.np); sai->sai_ck =devm_clk_get (&pdev->dev,"sai_ck" ); -if (IS_ERR (sai->sai_ck)) { -if (PTR_ERR (sai->sai_ck) != -EPROBE_DEFER ) -dev_err (&pdev->dev,"Missing kernel clock sai_ck: %ld\n" , -PTR_ERR (sai->sai_ck)); -return PTR_ERR (sai->sai_ck); - } +if (IS_ERR (sai->sai_ck)) +return dev_err_probe (&pdev->dev,PTR_ERR (sai->sai_ck), +"Missing kernel clock sai_ck\n" ); ret =clk_prepare (sai->pdata->pclk);if (ret <0 )
@@ -1551,11 +1545,8 @@ static int stm32_sai_sub_probe(struct platform_device *pdev) conf = &stm32_sai_pcm_config_spdif; ret =snd_dmaengine_pcm_register (&pdev->dev, conf,0 ); -if (ret) { -if (ret != -EPROBE_DEFER ) -dev_err (&pdev->dev,"Could not register pcm dma\n" ); -return ret; - } +if (ret) +return dev_err_probe (&pdev->dev, ret,"Could not register pcm dma\n" ); ret =snd_soc_register_component (&pdev->dev, &stm32_component, &sai->cpu_dai_drv,1 );
sound/soc/stm/stm32_spdifrx.c +15 -29
74 lines not on this page · raw message
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 2/3 ASoC: stm32: sai: Use the devm_clk_get_optional() helper
From: Christophe JAILLET <[email protected]>
[ Upstream commit 374628fb668e50b42fe81f2a63af616182415bcd ]
Use devm_clk_get_optional() instead of hand writing it. This saves some LoC and improves the semantic.
Stable-dep-of: 312ec2f0d9d1 ("ASoC: stm32: sai: fix clk prepare imbalance on probe failure")
--- sound/soc/stm/stm32_sai_sub.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
sound/soc/stm/stm32_sai_sub.c +3 -6
@@ -1486,12 +1486,9 @@ static int stm32_sai_sub_parse_of(struct platform_device *pdev,if (ret <0 )return ret; }else { - sai->sai_mclk =devm_clk_get (&pdev->dev,"MCLK" ); -if (IS_ERR (sai->sai_mclk)) { -if (PTR_ERR (sai->sai_mclk) != -ENOENT ) -return PTR_ERR (sai->sai_mclk); - sai->sai_mclk =NULL ; - } + sai->sai_mclk =devm_clk_get_optional (&pdev->dev,"MCLK" ); +if (IS_ERR (sai->sai_mclk)) +return PTR_ERR (sai->sai_mclk); }return 0 ;
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 3/3 ASoC: stm32: sai: fix clk prepare imbalance on probe failure
In reply to Sasha LevinFrom: Johan Hovold <[email protected]>
[ Upstream commit 312ec2f0d9d1a5656f76d770bbf1d967e9289aa7 ]
Make sure to unprepare the parent clock also on probe failures (e.g. probe deferral).
--- sound/soc/stm/stm32_sai_sub.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-)
sound/soc/stm/stm32_sai_sub.c +21 -7
@@ -1484,14 +1484,21 @@ static int stm32_sai_sub_parse_of(struct platform_device *pdev,if (of_find_property (np,"#clock-cells" ,NULL )) { ret =stm32_sai_add_mclk_provider (sai);if (ret <0 ) -return ret; + goto err_unprepare_pclk; }else { sai->sai_mclk =devm_clk_get_optional (&pdev->dev,"MCLK" ); -if (IS_ERR (sai->sai_mclk)) -return PTR_ERR (sai->sai_mclk); +if (IS_ERR (sai->sai_mclk)) { + ret =PTR_ERR (sai->sai_mclk); + goto err_unprepare_pclk; + } }return 0 ; + +err_unprepare_pclk: +clk_unprepare (sai->pdata->pclk); + +return ret; }static int stm32_sai_sub_probe (struct platform_device *pdev)
@@ -1535,26 +1542,33 @@ static int stm32_sai_sub_probe(struct platform_device *pdev) IRQF_SHARED, dev_name(&pdev->dev), sai);if (ret) {dev_err (&pdev->dev,"IRQ request returned %d\n" , ret); -return ret; + goto err_unprepare_pclk; }if (STM_SAI_PROTOCOL_IS_SPDIF (sai)) conf = &stm32_sai_pcm_config_spdif; ret =snd_dmaengine_pcm_register (&pdev->dev, conf,0 ); -if (ret) -return dev_err_probe (&pdev->dev, ret,"Could not register pcm dma\n" ); +if (ret) { + ret =dev_err_probe (&pdev->dev, ret,"Could not register pcm dma\n" ); + goto err_unprepare_pclk; + } ret =snd_soc_register_component (&pdev->dev, &stm32_component, &sai->cpu_dai_drv,1 );if (ret) {snd_dmaengine_pcm_unregister (&pdev->dev); -return ret; + goto err_unprepare_pclk; }pm_runtime_enable (&pdev->dev);return 0 ; + +err_unprepare_pclk: +clk_unprepare (sai->pdata->pclk); + +return ret; }static int stm32_sai_sub_remove (struct platform_device *pdev)
Signature · 1 line
2.51.0