From: Chen-Yu Tsai Date: Sat, 27 Aug 2016 11:27:59 +0000 (+0800) Subject: ASoC: dapm: Fix value setting for _ENUM_DOUBLE MUX's second channel X-Git-Tag: Ubuntu-4.9.0-1.2~750^2^2~18^2~1 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=071133a209354f39d4e5785d5a6a390e03241841;p=mirror_ubuntu-zesty-kernel.git ASoC: dapm: Fix value setting for _ENUM_DOUBLE MUX's second channel 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 Reviewed-by: Charles Keepax Signed-off-by: Mark Brown --- diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index edff395faccf..76d41412725d 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3203,7 +3203,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; }