ASoC: Move card list initialization to snd_soc_register_card
All ASoC cards need snd_soc_initialize_card_lists called. Previously, it was only called for cards backed by a "soc-audio" platform device, via soc_probe(). However, it's also needed for cards backed by other platform devices, and registered directly via snd_soc_register_card(). Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
d316553a0c
commit
111c6419ff
|
@ -1881,7 +1881,6 @@ static int soc_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
/* Bodge while we unpick instantiation */
|
/* Bodge while we unpick instantiation */
|
||||||
card->dev = &pdev->dev;
|
card->dev = &pdev->dev;
|
||||||
snd_soc_initialize_card_lists(card);
|
|
||||||
|
|
||||||
ret = snd_soc_register_card(card);
|
ret = snd_soc_register_card(card);
|
||||||
if (ret != 0) {
|
if (ret != 0) {
|
||||||
|
@ -3122,6 +3121,8 @@ int snd_soc_register_card(struct snd_soc_card *card)
|
||||||
if (!card->name || !card->dev)
|
if (!card->name || !card->dev)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
snd_soc_initialize_card_lists(card);
|
||||||
|
|
||||||
soc_init_card_debugfs(card);
|
soc_init_card_debugfs(card);
|
||||||
|
|
||||||
card->rtd = kzalloc(sizeof(struct snd_soc_pcm_runtime) *
|
card->rtd = kzalloc(sizeof(struct snd_soc_pcm_runtime) *
|
||||||
|
|
Loading…
Reference in New Issue