summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wm8955.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-09 14:29:13 +0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-09 14:29:13 +0300
commit07a9e2b2fbdda631eeff54e4b8ebcaaea71be538 (patch)
treef5f3751abc5c85effcb5d88101858c51dd19b234 /sound/soc/codecs/wm8955.c
parent05d209ad3b66efbb0925f01f1b3369fcbf31c86f (diff)
parenta0968628097380be52db8b4664da98fc425546a5 (diff)
downloadlinux-07a9e2b2fbdda631eeff54e4b8ebcaaea71be538.tar.xz
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/codecs/wm8955.c')
-rw-r--r--sound/soc/codecs/wm8955.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c
index 6200beb082b2..ca0265f008d2 100644
--- a/sound/soc/codecs/wm8955.c
+++ b/sound/soc/codecs/wm8955.c
@@ -379,7 +379,8 @@ static int wm8955_get_deemph(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec);
- return wm8955->deemph;
+ ucontrol->value.enumerated.item[0] = wm8955->deemph;
+ return 0;
}
static int wm8955_put_deemph(struct snd_kcontrol *kcontrol,