diff options
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/soc-core.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 133edeb9728a..a477e218aa28 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, | |||
1495 | 1495 | ||
1496 | soc_init_codec_debugfs(codec); | 1496 | soc_init_codec_debugfs(codec); |
1497 | 1497 | ||
1498 | if (driver->dapm_widgets) | ||
1499 | snd_soc_dapm_new_controls(&codec->dapm, driver->dapm_widgets, | ||
1500 | driver->num_dapm_widgets); | ||
1501 | |||
1498 | if (driver->probe) { | 1502 | if (driver->probe) { |
1499 | ret = driver->probe(codec); | 1503 | ret = driver->probe(codec); |
1500 | if (ret < 0) { | 1504 | if (ret < 0) { |
@@ -1508,9 +1512,6 @@ static int soc_probe_codec(struct snd_soc_card *card, | |||
1508 | if (driver->controls) | 1512 | if (driver->controls) |
1509 | snd_soc_add_controls(codec, driver->controls, | 1513 | snd_soc_add_controls(codec, driver->controls, |
1510 | driver->num_controls); | 1514 | driver->num_controls); |
1511 | if (driver->dapm_widgets) | ||
1512 | snd_soc_dapm_new_controls(&codec->dapm, driver->dapm_widgets, | ||
1513 | driver->num_dapm_widgets); | ||
1514 | if (driver->dapm_routes) | 1515 | if (driver->dapm_routes) |
1515 | snd_soc_dapm_add_routes(&codec->dapm, driver->dapm_routes, | 1516 | snd_soc_dapm_add_routes(&codec->dapm, driver->dapm_routes, |
1516 | driver->num_dapm_routes); | 1517 | driver->num_dapm_routes); |