Unverified Commit 7bdde9a2 authored by Sugar Zhang's avatar Sugar Zhang Committed by Mark Brown
Browse files

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: default avatarSugar Zhang <sugar.zhang@rock-chips.com>
Signed-off-by: default avatarSebastian 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: default avatarMark Brown <broonie@kernel.org>
parent 72bcc223

sound/soc/rockchip/rockchip_spdif.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

}