Merge branch 'for-2.6.37' into for-2.6.38

2010-12-09 11:29:13 +00:00
parent 05d209ad3b a096862809
commit 07a9e2b2fb
4 changed files with 7 additions and 4 deletions
--- 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,