aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8990.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-02-06 14:19:45 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-02-06 14:19:45 +0000
commite255265b475824fd5291df706093705ab677c29f (patch)
tree47388bb39a164a79096e0e5f371a350cbc2dc602 /sound/soc/codecs/wm8990.c
parent85ef2375ef2ebbb2bf660ad3a27c644d0ebf1b1a (diff)
parent397d5aeeb5a2c9ca6108899a04b35a51cd904503 (diff)
downloadkernel_samsung_espresso10-e255265b475824fd5291df706093705ab677c29f.zip
kernel_samsung_espresso10-e255265b475824fd5291df706093705ab677c29f.tar.gz
kernel_samsung_espresso10-e255265b475824fd5291df706093705ab677c29f.tar.bz2
Merge branch 'for-2.6.29' into for-2.6.30
Diffstat (limited to 'sound/soc/codecs/wm8990.c')
-rw-r--r--sound/soc/codecs/wm8990.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index a2e9cc9..1a38421 100644
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -176,7 +176,9 @@ static int wm899x_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- int reg = kcontrol->private_value & 0xff;
+ struct soc_mixer_control *mc =
+ (struct soc_mixer_control *)kcontrol->private_value;
+ int reg = mc->reg;
int ret;
u16 val;