From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 13 Apr 2011 00:51:37 +0000 (-0700)
Subject: ASoC: Create card DAPM widgets early so they can be used in callbacks
X-Git-Tag: MMI-PSA29.97-13-9~16612^2~1201
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9a841ebb9cac3f1b7253bb01c304f89b1af25aba;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ASoC: Create card DAPM widgets early so they can be used in callbacks

This helps with things like setting up the initial state.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
---

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 1f114673e952..3b3a377d0874 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1878,6 +1878,10 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
 	INIT_WORK(&card->deferred_resume_work, soc_resume_deferred);
 #endif
 
+	if (card->dapm_widgets)
+		snd_soc_dapm_new_controls(&card->dapm, card->dapm_widgets,
+					  card->num_dapm_widgets);
+
 	/* initialise the sound card only once */
 	if (card->probe) {
 		ret = card->probe(card);
@@ -1911,9 +1915,6 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
 				     card->controls,
 				     card->num_controls);
 
-	if (card->dapm_widgets)
-		snd_soc_dapm_new_controls(&card->dapm, card->dapm_widgets,
-					  card->num_dapm_widgets);
 	if (card->dapm_routes)
 		snd_soc_dapm_add_routes(&card->dapm, card->dapm_routes,
 					card->num_dapm_routes);