]> 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>
Thu, 15 Jan 2009 12:40:47 +0000 (14:40 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 15 Jan 2009 15:20:27 +0000 (16:20 +0100)
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>
sound/soc/soc-dapm.c

index 493a4e8aa27357cb74d07ed9858b7cdbc8c2e7e2..a2f1da8b464602fbac5ec55e86295d0f5fcda7ec 100644 (file)
@@ -720,7 +720,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))