diff options
| author | Liam Girdwood <lrg@ti.com> | 2011-05-18 17:50:07 +0100 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 09:06:10 -0700 |
| commit | a04b1985fb0f295bed15162719f1be21d2832441 (patch) | |
| tree | 507249bbcacd248745ba56731850ae24c38ed25d | |
| parent | 5e653d67d35889b6a8f4100310e617d83219d48d (diff) | |
| download | kernel_samsung_tuna-a04b1985fb0f295bed15162719f1be21d2832441.zip kernel_samsung_tuna-a04b1985fb0f295bed15162719f1be21d2832441.tar.gz kernel_samsung_tuna-a04b1985fb0f295bed15162719f1be21d2832441.tar.bz2 | |
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>
| -rw-r--r-- | 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 32ab7fc..f031764 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -492,10 +492,10 @@ static int dapm_new_mux(struct snd_soc_dapm_widget *w) 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; |