diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
| commit | a215aa7b9ab3759c047201199fba64d3042d7f13 (patch) | |
| tree | bca37493d9b2233450e6d3ffced1261d0e4f71fe /sound/soc/codecs/wm8904.c | |
| parent | d31199a77ef606f1d06894385f1852181ba6136b (diff) | |
Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso
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 f7dcabf6283c..f0897d8f444e 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c | |||
| @@ -820,7 +820,8 @@ static int wm8904_get_deemph(struct snd_kcontrol *kcontrol, | |||
| 820 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 820 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); |
| 821 | struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec); | 821 | struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec); |
| 822 | 822 | ||
| 823 | return wm8904->deemph; | 823 | ucontrol->value.enumerated.item[0] = wm8904->deemph; |
| 824 | return 0; | ||
| 824 | } | 825 | } |
| 825 | 826 | ||
| 826 | static int wm8904_put_deemph(struct snd_kcontrol *kcontrol, | 827 | static int wm8904_put_deemph(struct snd_kcontrol *kcontrol, |