diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-18 00:11:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-18 11:16:31 +0100 |
| commit | 4b1cfcb4f36dca33b4552d9612537e6c0ca73639 (patch) | |
| tree | 9c453ef2b49b1a26182f403ac7429bd87a568a19 /sound/soc | |
| parent | 680fa1f807bc65ea147c6c3ea52751cab75bcd34 (diff) | |
| download | blackbird-op-linux-4b1cfcb4f36dca33b4552d9612537e6c0ca73639.tar.gz blackbird-op-linux-4b1cfcb4f36dca33b4552d9612537e6c0ca73639.zip | |
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: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/soc-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index d6af52bd97df..a5d3685a5d38 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -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); |
