lkml.org 
[lkml]   [2015]   [Apr]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 041/144] ASoC: wm8731: Fix wrong value references for boolean kctl
    Date
    3.16.7-ckt10 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Takashi Iwai <tiwai@suse.de>

    commit bd14016fbf31aa199026f1e2358eab695f374eb1 upstream.

    The correct values referred by a boolean control are
    value.integer.value[], not value.enumerated.item[].
    The former is long while the latter is int, so it's even incompatible
    on 64bit architectures.

    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    sound/soc/codecs/wm8731.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
    index 5ada61611324..e12d9a54e3ad 100644
    --- a/sound/soc/codecs/wm8731.c
    +++ b/sound/soc/codecs/wm8731.c
    @@ -122,7 +122,7 @@ static int wm8731_get_deemph(struct snd_kcontrol *kcontrol,
    struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
    struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);

    - ucontrol->value.enumerated.item[0] = wm8731->deemph;
    + ucontrol->value.integer.value[0] = wm8731->deemph;

    return 0;
    }
    @@ -132,7 +132,7 @@ static int wm8731_put_deemph(struct snd_kcontrol *kcontrol,
    {
    struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
    struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
    - int deemph = ucontrol->value.enumerated.item[0];
    + int deemph = ucontrol->value.integer.value[0];
    int ret = 0;

    if (deemph > 1)

    \
     
     \ /
      Last update: 2015-04-21 18:41    [W:4.545 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site