lkml.org 
[lkml]   [2015]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.14 11/38] ASoC: adav80x: Fix wrong value references for boolean kctl
    Date
    3.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Takashi Iwai <tiwai@suse.de>

    commit 2bf4c1d483d911cda5dd385527194d23e5cea73d 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: Lars-Peter Clausen <lars@metafoo.de>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/soc/codecs/adav80x.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/sound/soc/codecs/adav80x.c
    +++ b/sound/soc/codecs/adav80x.c
    @@ -319,7 +319,7 @@ static int adav80x_put_deemph(struct snd
    {
    struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
    struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);
    - unsigned int deemph = ucontrol->value.enumerated.item[0];
    + unsigned int deemph = ucontrol->value.integer.value[0];

    if (deemph > 1)
    return -EINVAL;
    @@ -335,7 +335,7 @@ static int adav80x_get_deemph(struct snd
    struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
    struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);

    - ucontrol->value.enumerated.item[0] = adav80x->deemph;
    + ucontrol->value.integer.value[0] = adav80x->deemph;
    return 0;
    };




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