lkml.org 
[lkml]   [2015]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 109/172] ASoC: adav80x: Fix wrong value references for boolean kctl
    Date
    From: Takashi Iwai <tiwai@suse.de>

    3.4.108-rc1 review patch. If anyone has any objections, please let me know.

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


    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: Zefan Li <lizefan@huawei.com>
    ---
    sound/soc/codecs/adav80x.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c
    index ebd7b37..81e0e27 100644
    --- a/sound/soc/codecs/adav80x.c
    +++ b/sound/soc/codecs/adav80x.c
    @@ -307,7 +307,7 @@ static int adav80x_put_deemph(struct snd_kcontrol *kcontrol,
    {
    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;
    @@ -323,7 +323,7 @@ static int adav80x_get_deemph(struct snd_kcontrol *kcontrol,
    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;
    };

    --
    1.9.1


    \
     
     \ /
      Last update: 2015-06-16 11:01    [W:4.040 / U:1.596 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site