Skip to content

Commit

Permalink
ASoC: Fix prefixing of DAPM controls
Browse files Browse the repository at this point in the history
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: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
  • Loading branch information
Mark Brown committed Oct 18, 2011
1 parent 680fa1f commit 4b1cfcb
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1055,13 +1055,13 @@ static int soc_post_component_init(struct snd_soc_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 */
temp = codec->name_prefix;
codec->name_prefix = NULL;

/* Make sure all DAPM widgets are instantiated */
snd_soc_dapm_new_widgets(&codec->dapm);

/* do machine specific initialization */
if (!dailess && dai_link->init)
ret = dai_link->init(rtd);
Expand Down

0 comments on commit 4b1cfcb

Please sign in to comment.