diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-15 03:00:18 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-15 03:00:18 -0500 |
commit | b69bc3967445169ea4dc11171118b414eafab271 (patch) | |
tree | 52bff205f1fc1dbcae5aba7531c5b53f52b4823e /sound/soc/codecs/wm8990.c | |
parent | c466ed2e4337c5eb03b283da507eb5328ab06c73 (diff) | |
parent | d2f8d7ee1a9b4650b4e43325b321801264f7c37a (diff) |
Merge commit 'v2.6.29-rc5' into x86/apic
Diffstat (limited to 'sound/soc/codecs/wm8990.c')
-rw-r--r-- | sound/soc/codecs/wm8990.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c index 1cbb7b9b51ce..a5731faa150c 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, | |||
176 | struct snd_ctl_elem_value *ucontrol) | 176 | struct snd_ctl_elem_value *ucontrol) |
177 | { | 177 | { |
178 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 178 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); |
179 | int reg = kcontrol->private_value & 0xff; | 179 | struct soc_mixer_control *mc = |
180 | (struct soc_mixer_control *)kcontrol->private_value; | ||
181 | int reg = mc->reg; | ||
180 | int ret; | 182 | int ret; |
181 | u16 val; | 183 | u16 val; |
182 | 184 | ||