lkml.org 
[lkml]   [2015]   [Apr]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 133/155] ASoC: pcm1681: Fix wrong value references for boolean kctl
    Date
    From: Takashi Iwai <tiwai@suse.de>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit d7f58db49d9ad92bdb12d21fdc2308b76bc2ed38 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>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    sound/soc/codecs/pcm1681.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/codecs/pcm1681.c b/sound/soc/codecs/pcm1681.c
    index c91eba504f92..0819fa2ff710 100644
    --- a/sound/soc/codecs/pcm1681.c
    +++ b/sound/soc/codecs/pcm1681.c
    @@ -117,7 +117,7 @@ static int pcm1681_get_deemph(struct snd_kcontrol *kcontrol,
    struct snd_soc_codec *codec = snd_kcontrol_chip(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;
    }
    @@ -128,7 +128,7 @@ static int pcm1681_put_deemph(struct snd_kcontrol *kcontrol,
    struct snd_soc_codec *codec = snd_kcontrol_chip(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);
    }
    --
    2.3.4


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