diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-09 13:23:57 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-09 13:23:57 +0300 |
| commit | 95a9ca74768089d89c17ba958d6f009aa9c18525 (patch) | |
| tree | 513200c0d5255eb1918f64fc11417858b1539ebb /sound/soc/codecs/pcm1681.c | |
| parent | 4e2576bd36a12e78ac3786d05b99a820dffe687f (diff) | |
| parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
| download | linux-95a9ca74768089d89c17ba958d6f009aa9c18525.tar.xz | |
Merge tag 'v4.0-rc7' into asoc-core
Linux 4.0-rc7
Diffstat (limited to 'sound/soc/codecs/pcm1681.c')
| -rw-r--r-- | sound/soc/codecs/pcm1681.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/pcm1681.c b/sound/soc/codecs/pcm1681.c index a722a023c262..477e13d30971 100644 --- a/sound/soc/codecs/pcm1681.c +++ b/sound/soc/codecs/pcm1681.c @@ -118,7 +118,7 @@ static int pcm1681_get_deemph(struct snd_kcontrol *kcontrol, struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct pcm1681_private *priv = snd_soc_codec_get_drvdata(codec); - ucontrol->value.enumerated.item[0] = priv->deemph; + ucontrol->value.integer.value[0] = priv->deemph; return 0; } @@ -129,7 +129,7 @@ static int pcm1681_put_deemph(struct snd_kcontrol *kcontrol, struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct pcm1681_private *priv = snd_soc_codec_get_drvdata(codec); - priv->deemph = ucontrol->value.enumerated.item[0]; + priv->deemph = ucontrol->value.integer.value[0]; return pcm1681_set_deemph(codec); } |