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/wm8960.c | |
| parent | d31199a77ef606f1d06894385f1852181ba6136b (diff) | |
Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso
Diffstat (limited to 'sound/soc/codecs/wm8960.c')
| -rw-r--r-- | sound/soc/codecs/wm8960.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 3c6ee61f6c95..2331f51b0d11 100644 --- 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, | |||
| 137 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 137 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); |
| 138 | struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); | 138 | struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); |
| 139 | 139 | ||
| 140 | return wm8960->deemph; | 140 | ucontrol->value.enumerated.item[0] = wm8960->deemph; |
| 141 | return 0; | ||
| 141 | } | 142 | } |
| 142 | 143 | ||
| 143 | static int wm8960_put_deemph(struct snd_kcontrol *kcontrol, | 144 | static int wm8960_put_deemph(struct snd_kcontrol *kcontrol, |