diff options
| author |   Mark Brown <broonie@kernel.org> | 2015-04-09 11:23:57 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-09 11:23:57 +0100 |
| commit | 95a9ca74768089d89c17ba958d6f009aa9c18525 (patch) | |
| tree | 513200c0d5255eb1918f64fc11417858b1539ebb /sound/soc/codecs/es8328.c | |
| parent | ASoC: soc-core: initialize debugfs in snd_soc_instantiate_card() (diff) | |
| parent | Linux 4.0-rc7 (diff) | |
| download | linux-dev-95a9ca74768089d89c17ba958d6f009aa9c18525.tar.xz linux-dev-95a9ca74768089d89c17ba958d6f009aa9c18525.zip | |
Merge tag 'v4.0-rc7' into asoc-core
Linux 4.0-rc7
Diffstat (limited to 'sound/soc/codecs/es8328.c')
| -rw-r--r-- | sound/soc/codecs/es8328.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/es8328.c b/sound/soc/codecs/es8328.c index f27325155ace..c5f35a07e8e4 100644 --- a/sound/soc/codecs/es8328.c +++ b/sound/soc/codecs/es8328.c @@ -120,7 +120,7 @@ static int es8328_get_deemph(struct snd_kcontrol *kcontrol, struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct es8328_priv *es8328 = snd_soc_codec_get_drvdata(codec); - ucontrol->value.enumerated.item[0] = es8328->deemph; + ucontrol->value.integer.value[0] = es8328->deemph; return 0; } @@ -129,7 +129,7 @@ static int es8328_put_deemph(struct snd_kcontrol *kcontrol, { struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct es8328_priv *es8328 = snd_soc_codec_get_drvdata(codec); - int deemph = ucontrol->value.enumerated.item[0]; + int deemph = ucontrol->value.integer.value[0]; int ret; if (deemph > 1) |