From: Lars-Peter Clausen Date: Thu, 5 May 2011 14:59:09 +0000 (+0200) Subject: ASoC: Create codec DAPM widgets before calling the codecs probe function X-Git-Tag: v3.0-rc1~347^2~1^2~27^2~12 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=77530150fba769d7b7e260b3f16ed2294c1737b6;p=~shefty%2Frdma-dev.git ASoC: Create codec DAPM widgets before calling the codecs probe function This allows to create DAPM routes depending on those widgets in the codecs probe function. This is helpful when supporting similar codecs with minor differences in the DAPM routing with the same driver. Something similar has already been done for cards in commit a841ebb9 (ASoC: Create card DAPM widgets early so they can be used in callbacks). Signed-off-by: Lars-Peter Clausen Acked-by: Liam Girdwood Signed-off-by: Mark Brown --- diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 133edeb9728..a477e218aa2 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1495,6 +1495,10 @@ static int soc_probe_codec(struct snd_soc_card *card, soc_init_codec_debugfs(codec); + if (driver->dapm_widgets) + snd_soc_dapm_new_controls(&codec->dapm, driver->dapm_widgets, + driver->num_dapm_widgets); + if (driver->probe) { ret = driver->probe(codec); if (ret < 0) { @@ -1508,9 +1512,6 @@ static int soc_probe_codec(struct snd_soc_card *card, if (driver->controls) snd_soc_add_controls(codec, driver->controls, driver->num_controls); - if (driver->dapm_widgets) - snd_soc_dapm_new_controls(&codec->dapm, driver->dapm_widgets, - driver->num_dapm_widgets); if (driver->dapm_routes) snd_soc_dapm_add_routes(&codec->dapm, driver->dapm_routes, driver->num_dapm_routes);