Skip to content

Commit 312ec2f

Browse files
jhovoldbroonie
authored andcommitted
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). Fixes: a14bf98 ("ASoC: stm32: sai: fix possible circular locking") Cc: stable@vger.kernel.org # 5.5 Cc: Olivier Moysan <olivier.moysan@st.com> Signed-off-by: Johan Hovold <johan@kernel.org> Reviewed-by: olivier moysan <olivier.moysan@foss.st.com> Link: https://patch.msgid.link/20251124104908.15754-3-johan@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent e26ff42 commit 312ec2f

1 file changed

Lines changed: 21 additions & 7 deletions

File tree

sound/soc/stm/stm32_sai_sub.c

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1634,14 +1634,21 @@ static int stm32_sai_sub_parse_of(struct platform_device *pdev,
16341634
if (of_property_present(np, "#clock-cells")) {
16351635
ret = stm32_sai_add_mclk_provider(sai);
16361636
if (ret < 0)
1637-
return ret;
1637+
goto err_unprepare_pclk;
16381638
} else {
16391639
sai->sai_mclk = devm_clk_get_optional(&pdev->dev, "MCLK");
1640-
if (IS_ERR(sai->sai_mclk))
1641-
return PTR_ERR(sai->sai_mclk);
1640+
if (IS_ERR(sai->sai_mclk)) {
1641+
ret = PTR_ERR(sai->sai_mclk);
1642+
goto err_unprepare_pclk;
1643+
}
16421644
}
16431645

16441646
return 0;
1647+
1648+
err_unprepare_pclk:
1649+
clk_unprepare(sai->pdata->pclk);
1650+
1651+
return ret;
16451652
}
16461653

16471654
static int stm32_sai_sub_probe(struct platform_device *pdev)
@@ -1688,26 +1695,33 @@ static int stm32_sai_sub_probe(struct platform_device *pdev)
16881695
IRQF_SHARED, dev_name(&pdev->dev), sai);
16891696
if (ret) {
16901697
dev_err(&pdev->dev, "IRQ request returned %d\n", ret);
1691-
return ret;
1698+
goto err_unprepare_pclk;
16921699
}
16931700

16941701
if (STM_SAI_PROTOCOL_IS_SPDIF(sai))
16951702
conf = &stm32_sai_pcm_config_spdif;
16961703

16971704
ret = snd_dmaengine_pcm_register(&pdev->dev, conf, 0);
1698-
if (ret)
1699-
return dev_err_probe(&pdev->dev, ret, "Could not register pcm dma\n");
1705+
if (ret) {
1706+
ret = dev_err_probe(&pdev->dev, ret, "Could not register pcm dma\n");
1707+
goto err_unprepare_pclk;
1708+
}
17001709

17011710
ret = snd_soc_register_component(&pdev->dev, &stm32_component,
17021711
&sai->cpu_dai_drv, 1);
17031712
if (ret) {
17041713
snd_dmaengine_pcm_unregister(&pdev->dev);
1705-
return ret;
1714+
goto err_unprepare_pclk;
17061715
}
17071716

17081717
pm_runtime_enable(&pdev->dev);
17091718

17101719
return 0;
1720+
1721+
err_unprepare_pclk:
1722+
clk_unprepare(sai->pdata->pclk);
1723+
1724+
return ret;
17111725
}
17121726

17131727
static void stm32_sai_sub_remove(struct platform_device *pdev)

0 commit comments

Comments
 (0)