From 1564c3cddee8ca852619698c19dadb83602f4d19 Mon Sep 17 00:00:00 2001 From: Sugar Zhang Date: Fri, 19 Jul 2024 16:49:11 +0800 Subject: [PATCH] ASoC: rockchip: spdif: Register PCM before DAI component API snd_soc_register_component will try to rebind card per each component register. and the ASoC allow no-pcm card instance. devm_snd_soc_register_component snd_soc_try_rebind_card snd_soc_bind_card snd_soc_add_pcm_runtime devm_snd_dmaengine_pcm_register So, we should register PCM before DAI component. Signed-off-by: Sugar Zhang Change-Id: Id099f4774e040263a370da36427529d45071c173 --- sound/soc/rockchip/rockchip_spdif.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c index 18460851c53e..7977887d6f5f 100644 --- a/sound/soc/rockchip/rockchip_spdif.c +++ b/sound/soc/rockchip/rockchip_spdif.c @@ -399,6 +399,12 @@ static int rk_spdif_probe(struct platform_device *pdev) goto err_pm_runtime; } + ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); + if (ret) { + dev_err(&pdev->dev, "Could not register PCM\n"); + goto err_pm_suspend; + } + ret = devm_snd_soc_register_component(&pdev->dev, &rk_spdif_component, &rk_spdif_dai, 1); @@ -407,12 +413,6 @@ static int rk_spdif_probe(struct platform_device *pdev) goto err_pm_suspend; } - ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); - if (ret) { - dev_err(&pdev->dev, "Could not register PCM\n"); - goto err_pm_suspend; - } - return 0; err_pm_suspend: