admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: stm32: sai: fix clk prepare imbalance on probe failure

Browse Source 
Make sure to unprepare the parent clock also on probe failures (e.g.
probe deferral).

Fixes: a14bf98c04 ("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>
This commit is contained in:
Johan Hovold
2025-11-24 11:49:06 +01:00
committed by Mark Brown
parent e26ff429ea
commit 312ec2f0d9
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sound/soc/stm/stm32_sai_sub.c
View File

@@ -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)