From: Jaswinder Jassal <jjassal@opensource.wolfsonmicro.com>
Date: Mon, 29 Aug 2016 15:06:58 +0000 (+0100)
Subject: ASoC: core: fix shift used for second item in snd_soc_get_enum_double
X-Git-Tag: v4.9-rc1~120^2^2~16^6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=189f06c031d431d4fb7a78952df4c83ac7822b79;p=karo-tx-linux.git

ASoC: core: fix shift used for second item in snd_soc_get_enum_double

Incorrect shift value was being used to extract the second item.

Signed-off-by: Jaswinder Jassal <jjassal@opensource.wolfsonmicro.com>
Reviewed-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---

diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c
index a513a34a51d2..9fc1a7bb8b95 100644
--- a/sound/soc/soc-ops.c
+++ b/sound/soc/soc-ops.c
@@ -77,7 +77,7 @@ int snd_soc_get_enum_double(struct snd_kcontrol *kcontrol,
 	item = snd_soc_enum_val_to_item(e, val);
 	ucontrol->value.enumerated.item[0] = item;
 	if (e->shift_l != e->shift_r) {
-		val = (reg_val >> e->shift_l) & e->mask;
+		val = (reg_val >> e->shift_r) & e->mask;
 		item = snd_soc_enum_val_to_item(e, val);
 		ucontrol->value.enumerated.item[1] = item;
 	}