From: Milan plzik Date: Thu, 10 Jan 2008 13:39:46 +0000 (+0100) Subject: [ALSA] soc - Fix power switching support for DAPM_SWITCH widgets X-Git-Tag: v2.6.25-rc1~1127^2~136 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1b075e3f7323f85f7e9cc7b6ae7a36c33d9ce76e;p=linux-2.6-omap-h63xx.git [ALSA] soc - Fix power switching support for DAPM_SWITCH widgets Signed-off-by: Milan plzik Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 7eb6c5c0377..91d58b56470 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -691,7 +691,7 @@ static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget, return 0; } -/* test and update the power status of a mixer widget */ +/* test and update the power status of a mixer or switch widget */ static int dapm_mixer_update_power(struct snd_soc_dapm_widget *widget, struct snd_kcontrol *kcontrol, int reg, int val_mask, int val, int invert) @@ -699,7 +699,8 @@ static int dapm_mixer_update_power(struct snd_soc_dapm_widget *widget, struct snd_soc_dapm_path *path; int found = 0; - if (widget->id != snd_soc_dapm_mixer) + if (widget->id != snd_soc_dapm_mixer && + widget->id != snd_soc_dapm_switch) return -ENODEV; if (!snd_soc_test_bits(widget->codec, reg, val_mask, val))