diff options
| author | Stephen Warren <swarren@nvidia.com> | 2011-01-28 14:26:35 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-31 13:15:35 +0000 |
| commit | 111c6419ffeef0ef225dfdd2c8b7b03cc6bb228e (patch) | |
| tree | 7fb4dc5a2af4fc00a17df031d29275ad0ce44d22 /sound/soc/soc-core.c | |
| parent | d316553a0cb4569a9b6260e870cab8b9c102eace (diff) | |
| download | linux-3.10-111c6419ffeef0ef225dfdd2c8b7b03cc6bb228e.tar.gz linux-3.10-111c6419ffeef0ef225dfdd2c8b7b03cc6bb228e.tar.bz2 linux-3.10-111c6419ffeef0ef225dfdd2c8b7b03cc6bb228e.zip | |
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>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 9dfbb8fcb76..3feddd91b97 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) /* Bodge while we unpick instantiation */ card->dev = &pdev->dev; - snd_soc_initialize_card_lists(card); ret = snd_soc_register_card(card); if (ret != 0) { @@ -3122,6 +3121,8 @@ int snd_soc_register_card(struct snd_soc_card *card) if (!card->name || !card->dev) return -EINVAL; + snd_soc_initialize_card_lists(card); + soc_init_card_debugfs(card); card->rtd = kzalloc(sizeof(struct snd_soc_pcm_runtime) * |