Skip to content

Commit 7bdde9a

Browse files
Sugar Zhangbroonie
authored andcommitted
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>
1 parent 72bcc22 commit 7bdde9a

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

sound/soc/rockchip/rockchip_spdif.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -325,16 +325,16 @@ static int rk_spdif_probe(struct platform_device *pdev)
325325
return ret;
326326
}
327327

328+
ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
329+
if (ret)
330+
return dev_err_probe(&pdev->dev, ret, "Could not register PCM\n");
331+
328332
ret = devm_snd_soc_register_component(&pdev->dev,
329333
&rk_spdif_component,
330334
&rk_spdif_dai, 1);
331335
if (ret)
332336
return dev_err_probe(&pdev->dev, ret, "Could not register DAI\n");
333337

334-
ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
335-
if (ret)
336-
return dev_err_probe(&pdev->dev, ret, "Could not register PCM\n");
337-
338338
return 0;
339339
}
340340

0 commit comments

Comments
 (0)