From 19232f8a55478dcbe0bb797b63469981eb066ab2 Mon Sep 17 00:00:00 2001 From: Milan plzik Date: Thu, 10 Jan 2008 14:39:46 +0100 Subject: [PATCH] --- yaml --- r: 81609 b: refs/heads/master c: 1b075e3f7323f85f7e9cc7b6ae7a36c33d9ce76e h: refs/heads/master i: 81607: 69acc66492f5881c1b1e08227736081e31f802bd v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-dapm.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ab62f952c62a..e88cc4b8c64c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ccab3e72e211c40d868045c7d3216948999bcf7 +refs/heads/master: 1b075e3f7323f85f7e9cc7b6ae7a36c33d9ce76e diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c index 7eb6c5c03775..91d58b56470e 100644 --- a/trunk/sound/soc/soc-dapm.c +++ b/trunk/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))