aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/soc-core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 9dfbb8fcb765..3feddd91b973 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1881,7 +1881,6 @@ static int soc_probe(struct platform_device *pdev)
1881 1881
1882 /* Bodge while we unpick instantiation */ 1882 /* Bodge while we unpick instantiation */
1883 card->dev = &pdev->dev; 1883 card->dev = &pdev->dev;
1884 snd_soc_initialize_card_lists(card);
1885 1884
1886 ret = snd_soc_register_card(card); 1885 ret = snd_soc_register_card(card);
1887 if (ret != 0) { 1886 if (ret != 0) {
@@ -3122,6 +3121,8 @@ int snd_soc_register_card(struct snd_soc_card *card)
3122 if (!card->name || !card->dev) 3121 if (!card->name || !card->dev)
3123 return -EINVAL; 3122 return -EINVAL;
3124 3123
3124 snd_soc_initialize_card_lists(card);
3125
3125 soc_init_card_debugfs(card); 3126 soc_init_card_debugfs(card);
3126 3127
3127 card->rtd = kzalloc(sizeof(struct snd_soc_pcm_runtime) * 3128 card->rtd = kzalloc(sizeof(struct snd_soc_pcm_runtime) *