diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-15 12:27:20 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-15 12:27:20 -0500 |
| commit | c0106d72b8d71696dbe9dc80e2c77d4ac63f7531 (patch) | |
| tree | ca96d2baecb0555e36219ed6968dc8e306e530ca /sound/soc/soc-dapm.c | |
| parent | 5852973c129cf7c7e6c229abb7250673fc2a50c9 (diff) | |
| parent | eff317d0834ad1ff03f747f6bc2d76b9a9c95160 (diff) | |
Merge branch 'topic/asoc' into next/asoc
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 3a759c2872a8..54b4564b82b4 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
| @@ -741,7 +741,8 @@ static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget, | |||
| 741 | struct snd_soc_dapm_path *path; | 741 | struct snd_soc_dapm_path *path; |
| 742 | int found = 0; | 742 | int found = 0; |
| 743 | 743 | ||
| 744 | if (widget->id != snd_soc_dapm_mux) | 744 | if (widget->id != snd_soc_dapm_mux && |
| 745 | widget->id != snd_soc_dapm_value_mux) | ||
| 745 | return -ENODEV; | 746 | return -ENODEV; |
| 746 | 747 | ||
| 747 | if (!snd_soc_test_bits(widget->codec, e->reg, mask, val)) | 748 | if (!snd_soc_test_bits(widget->codec, e->reg, mask, val)) |