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/wm8955.c | |
| parent | d31199a77ef606f1d06894385f1852181ba6136b (diff) | |
Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso
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 5f025593d84d..004e83765642 100644 --- a/sound/soc/codecs/wm8955.c +++ b/sound/soc/codecs/wm8955.c | |||
| @@ -384,7 +384,8 @@ static int wm8955_get_deemph(struct snd_kcontrol *kcontrol, | |||
| 384 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 384 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); |
| 385 | struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec); | 385 | struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec); |
| 386 | 386 | ||
| 387 | return wm8955->deemph; | 387 | ucontrol->value.enumerated.item[0] = wm8955->deemph; |
| 388 | return 0; | ||
| 388 | } | 389 | } |
| 389 | 390 | ||
| 390 | static int wm8955_put_deemph(struct snd_kcontrol *kcontrol, | 391 | static int wm8955_put_deemph(struct snd_kcontrol *kcontrol, |