diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-09 11:29:13 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-09 11:29:13 +0000 |
| commit | 07a9e2b2fbdda631eeff54e4b8ebcaaea71be538 (patch) | |
| tree | f5f3751abc5c85effcb5d88101858c51dd19b234 /sound/soc/codecs/wm8960.c | |
| parent | 05d209ad3b66efbb0925f01f1b3369fcbf31c86f (diff) | |
| parent | a0968628097380be52db8b4664da98fc425546a5 (diff) | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/codecs/wm8960.c')
| -rw-r--r-- | sound/soc/codecs/wm8960.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 0bcf36ee29bc..2c5712dce1d5 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -137,7 +137,8 @@ static int wm8960_get_deemph(struct snd_kcontrol *kcontrol, struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); - return wm8960->deemph; + ucontrol->value.enumerated.item[0] = wm8960->deemph; + return 0; } static int wm8960_put_deemph(struct snd_kcontrol *kcontrol, |