| commit | e8d7bd34a5cd850329b4908efe6f3ae73bc5fd1a | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Thu Jan 15 16:22:28 2009 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Thu Jan 15 16:22:28 2009 +0100 |
| tree | 04ae8d260c6c94af48256262de59b3950f445aab | |
| parent | eff317d0834ad1ff03f747f6bc2d76b9a9c95160 [diff] | |
| parent | 1b0652eb588e57c3ab230e0291e7da99c7e665e0 [diff] |
Merge branch 'topic/hda' into for-linus
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 493a4e8..a2f1da8 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c
@@ -720,7 +720,8 @@ struct snd_soc_dapm_path *path; int found = 0; - if (widget->id != snd_soc_dapm_mux) + if (widget->id != snd_soc_dapm_mux && + widget->id != snd_soc_dapm_value_mux) return -ENODEV; if (!snd_soc_test_bits(widget->codec, e->reg, mask, val))