diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-23 09:48:41 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-23 09:48:41 +0100 |
| commit | 26e20a108caca6231c6a5ec659f815a866904751 (patch) | |
| tree | 36932c208a9e8994bfd7ed4eaf48b9c33f71fbe3 /sound/soc/codecs/wm8955.c | |
| parent | 691513f70d3957939a318da970987b876c720861 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
| download | linux-stable-26e20a108caca6231c6a5ec659f815a866904751.tar.gz linux-stable-26e20a108caca6231c6a5ec659f815a866904751.tar.bz2 linux-stable-26e20a108caca6231c6a5ec659f815a866904751.zip | |
Merge commit 'v2.6.37-rc7' into x86/security
Diffstat (limited to 'sound/soc/codecs/wm8955.c')
| -rw-r--r-- | sound/soc/codecs/wm8955.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c index f89ad6c9a80b..9cbab8e1de01 100644 --- a/sound/soc/codecs/wm8955.c +++ b/sound/soc/codecs/wm8955.c @@ -380,7 +380,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, |