diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-17 15:28:37 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-12-17 15:28:37 +0100 |
| commit | 5aad6c5f7733b94e666e3bf8b57beb7bbee15886 (patch) | |
| tree | a3228f3eec1de68678bb27613568ded50730ba9c /sound/soc/codecs/wm8904.c | |
| parent | 8cd1fd2526a78eaa1785a8ae3fe9f45a8ddd0e17 (diff) | |
| parent | 862af8adbe6b9ccb7c00c13717b1f92465f79aa2 (diff) | |
Merge branch 'fix/asoc' into for-linus
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 fca60a0b57b8..9001cc48ba13 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -818,7 +818,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, |