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/wm8904.c | |
| parent | 05d209ad3b66efbb0925f01f1b3369fcbf31c86f (diff) | |
| parent | a0968628097380be52db8b4664da98fc425546a5 (diff) | |
| download | blackbird-obmc-linux-07a9e2b2fbdda631eeff54e4b8ebcaaea71be538.tar.gz blackbird-obmc-linux-07a9e2b2fbdda631eeff54e4b8ebcaaea71be538.zip | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/codecs/wm8904.c')
| -rw-r--r-- | sound/soc/codecs/wm8904.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index d0024666eaf9..8ba142abd8e6 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -817,7 +817,8 @@ static int wm8904_get_deemph(struct snd_kcontrol *kcontrol, struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec); - return wm8904->deemph; + ucontrol->value.enumerated.item[0] = wm8904->deemph; + return 0; } static int wm8904_put_deemph(struct snd_kcontrol *kcontrol, |
