Commit 4b1cfcb4 authored by Mark Brown's avatar Mark Brown

ASoC: Fix prefixing of DAPM controls

We don't want to clear the prefix while we're creating the DAPM controls
for the device as the prefix is applied during control creation.
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
parent 680fa1f8
...@@ -1055,13 +1055,13 @@ static int soc_post_component_init(struct snd_soc_card *card, ...@@ -1055,13 +1055,13 @@ static int soc_post_component_init(struct snd_soc_card *card,
} }
rtd->card = card; rtd->card = card;
/* Make sure all DAPM widgets are instantiated */
snd_soc_dapm_new_widgets(&codec->dapm);
/* machine controls, routes and widgets are not prefixed */ /* machine controls, routes and widgets are not prefixed */
temp = codec->name_prefix; temp = codec->name_prefix;
codec->name_prefix = NULL; codec->name_prefix = NULL;
/* Make sure all DAPM widgets are instantiated */
snd_soc_dapm_new_widgets(&codec->dapm);
/* do machine specific initialization */ /* do machine specific initialization */
if (!dailess && dai_link->init) if (!dailess && dai_link->init)
ret = dai_link->init(rtd); ret = dai_link->init(rtd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment