diff options
| author | Sugar Zhang <sugar.zhang@rock-chips.com> | 2026-02-03 17:46:28 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-02-05 18:46:45 +0000 |
| commit | 7bdde9a2fd6577e18cd99e4f0e71e466ba626e77 (patch) | |
| tree | ede14c4bcb677c77b5c76ffba13e1572a3e326ed | |
| parent | 72bcc223032cb71e640e466eb644537e369959a5 (diff) | |
ASoC: rockchip: spdif: Swap PCM and DAI component registration order
PCM should be registered before the DAI component, as the second one
triggers snd_soc_try_rebind_card.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Link: https://patch.msgid.link/20260203-rockchip-spdif-cleanup-and-bsp-sync-v2-6-4412016cf577@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/rockchip/rockchip_spdif.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c index 55d64fd4c93b..c1221ff00ed7 100644 --- a/sound/soc/rockchip/rockchip_spdif.c +++ b/sound/soc/rockchip/rockchip_spdif.c @@ -325,16 +325,16 @@ static int rk_spdif_probe(struct platform_device *pdev) return ret; } + ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); + if (ret) + return dev_err_probe(&pdev->dev, ret, "Could not register PCM\n"); + ret = devm_snd_soc_register_component(&pdev->dev, &rk_spdif_component, &rk_spdif_dai, 1); if (ret) return dev_err_probe(&pdev->dev, ret, "Could not register DAI\n"); - ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); - if (ret) - return dev_err_probe(&pdev->dev, ret, "Could not register PCM\n"); - return 0; } |