Merge branch 'for-2.6.37' into for-2.6.38

[mv-sheeva.git] / sound / soc / codecs / wm8955.c

diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c
index 6200beb082b22cb64c625333c6536f19524180da..ca0265f008d2914d14372a5193820ac2b1ed6b74 100644 (file)
--- 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,