[alsa-devel] [PATCH] ASoC: dapm - fix prefix for DAPM muxes

Make sure DAPM muxes have a valid kcontrol name instead of NULL.

Signed-off-by: Liam Girdwood lrg@ti.com --- sound/soc/soc-dapm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 456617e..c5d98e3 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -489,10 +489,10 @@ static int dapm_new_mux(struct snd_soc_dapm_context *dapm, wlist->widgets[wlistentries - 1] = w;

if (!kcontrol) { - if (dapm->codec) + if (dapm->codec && dapm->codec->name_prefix) prefix = dapm->codec->name_prefix; else - prefix = NULL; + prefix = w->name;

if (shared) { name = w->kcontrol_news[0].name;