]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ASoC: Fix the power update function for snd_soc_dapm_value_mux
authorPeter Ujfalusi <peter.ujfalusi@nokia.com>
Fri, 16 Jan 2009 07:48:06 +0000 (09:48 +0200)
committerTony Lindgren <tony@atomide.com>
Fri, 16 Jan 2009 07:51:06 +0000 (09:51 +0200)
Modify the check for the mux type to also handle the
snd_soc_dapm_value_mux type in a same way as the snd_soc_dapm_mux.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
sound/soc/soc-dapm.c

index ad0d801677c13ccd64eaa7942f1c120ecb07b144..7cf2b3f6eaae180c32008f0203a4992328315c67 100644 (file)
@@ -744,7 +744,8 @@ static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget,
        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))