summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2016-08-27 19:27:59 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-31 04:14:00 -0600
commitde0b70569c1ec41b2c7d7464c5dac36ebdf1c735 (patch)
tree69d593fd2ca89521dd65e8ec1342b2ce7ab13412 /sound
parent41201d18e2c40d82bb022b382c417c216c91fbbb (diff)
downloadlinux-stable-de0b70569c1ec41b2c7d7464c5dac36ebdf1c735.tar.gz
linux-stable-de0b70569c1ec41b2c7d7464c5dac36ebdf1c735.tar.bz2
linux-stable-de0b70569c1ec41b2c7d7464c5dac36ebdf1c735.zip
ASoC: dapm: Fix value setting for _ENUM_DOUBLE MUX's second channel
commit 071133a209354f39d4e5785d5a6a390e03241841 upstream. The value for the second channel in _ENUM_DOUBLE (double channel) MUXs is not correctly updated, due to using the wrong bit shift. Use the correct bit shift, so both channels toggle together. Fixes: 3727b4968453 (ASoC: dapm: Consolidate MUXs and value MUXs) Signed-off-by: Chen-Yu Tsai <wens@csie.org> Reviewed-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-dapm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index b670d212a9c3..368e5044ad88 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3169,7 +3169,7 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol,
if (e->shift_l != e->shift_r) {
if (item[1] > e->items)
return -EINVAL;
- val |= snd_soc_enum_item_to_val(e, item[1]) << e->shift_l;
+ val |= snd_soc_enum_item_to_val(e, item[1]) << e->shift_r;
mask |= e->mask << e->shift_r;
}