From 5ef885b8503ea23ec5afb961dd82f84e2acf7856 Mon Sep 17 00:00:00 2001 From: Stuart Longland Date: Fri, 18 Jun 2010 12:56:10 +1000 Subject: [PATCH] --- yaml --- r: 206562 b: refs/heads/master c: 20630c7f5966419dd6a1f00b669a7771e228510a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c75c73eeb40c..f51c2e1c6277 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43793207fdcede490edf26a813a92b11ef434a13 +refs/heads/master: 20630c7f5966419dd6a1f00b669a7771e228510a diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c index 26f17323ef19..8b79d90efdc1 100644 --- a/trunk/sound/soc/soc-core.c +++ b/trunk/sound/soc/soc-core.c @@ -2396,8 +2396,8 @@ int snd_soc_get_volsw_2r_sx(struct snd_kcontrol *kcontrol, int val = snd_soc_read(codec, mc->reg) & mask; int valr = snd_soc_read(codec, mc->rreg) & mask; - ucontrol->value.integer.value[0] = ((val & 0xff)-min); - ucontrol->value.integer.value[1] = ((valr & 0xff)-min); + ucontrol->value.integer.value[0] = ((val & 0xff)-min) & mask; + ucontrol->value.integer.value[1] = ((valr & 0xff)-min) & mask; return 0; } EXPORT_SYMBOL_GPL(snd_soc_get_volsw_2r_sx);