]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ASoC: mediatek: Fix double pm_runtime_disable in remove functions
authorHaotian Zhang <vulab@iscas.ac.cn>
Mon, 20 Oct 2025 17:04:40 +0000 (01:04 +0800)
committerMark Brown <broonie@kernel.org>
Thu, 23 Oct 2025 23:59:54 +0000 (00:59 +0100)
Both mt8195-afe-pcm and mt8365-afe-pcm drivers use devm_pm_runtime_enable()
in probe function, which automatically calls pm_runtime_disable() on device
removal via devres mechanism. However, the remove callbacks explicitly call
pm_runtime_disable() again, resulting in double pm_runtime_disable() calls.

Fix by removing the redundant pm_runtime_disable() calls from remove
functions, letting the devres framework handle it automatically.

Fixes: 2ca0ec01d49c ("ASoC: mediatek: mt8195-afe-pcm: Simplify runtime PM during probe")
Fixes: e1991d102bc2 ("ASoC: mediatek: mt8365: Add the AFE driver support")
Signed-off-by: Haotian Zhang <vulab@iscas.ac.cn>
Link: https://patch.msgid.link/20251020170440.585-1-vulab@iscas.ac.cn
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/mediatek/mt8195/mt8195-afe-pcm.c
sound/soc/mediatek/mt8365/mt8365-afe-pcm.c

index 5d025ad72263f6f691d10ec11db3abe2a58585fe..c63b3444bc17692a4c05726e50f6e72c2e51113e 100644 (file)
@@ -3176,7 +3176,6 @@ err_pm_put:
 
 static void mt8195_afe_pcm_dev_remove(struct platform_device *pdev)
 {
-       pm_runtime_disable(&pdev->dev);
        if (!pm_runtime_status_suspended(&pdev->dev))
                mt8195_afe_runtime_suspend(&pdev->dev);
 }
index 10793bbe9275d6f803315096fb6d9712ff173169..d48252cd96ac4c1992f4bc71fe6787315df9f8f2 100644 (file)
@@ -2238,7 +2238,6 @@ static void mt8365_afe_pcm_dev_remove(struct platform_device *pdev)
 
        mt8365_afe_disable_top_cg(afe, MT8365_TOP_CG_AFE);
 
-       pm_runtime_disable(&pdev->dev);
        if (!pm_runtime_status_suspended(&pdev->dev))
                mt8365_afe_runtime_suspend(&pdev->dev);
 }