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 112/172] ASoC: wm2000: 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 00a14c2968e3d55817e0fa35c78106ca840537bf 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>
    [lizf: Backported to 3.4: adjust context]
    Signed-off-by: Zefan Li <lizefan@huawei.com>
    ---
    sound/soc/codecs/wm2000.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c
    index bb9f070..fb1f0a7 100644
    --- a/sound/soc/codecs/wm2000.c
    +++ b/sound/soc/codecs/wm2000.c
    @@ -581,7 +581,7 @@ static int wm2000_anc_mode_get(struct snd_kcontrol *kcontrol,
    struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
    struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);

    - ucontrol->value.enumerated.item[0] = wm2000->anc_active;
    + ucontrol->value.integer.value[0] = wm2000->anc_active;

    return 0;
    }
    @@ -591,7 +591,7 @@ static int wm2000_anc_mode_put(struct snd_kcontrol *kcontrol,
    {
    struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
    struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
    - int anc_active = ucontrol->value.enumerated.item[0];
    + int anc_active = ucontrol->value.integer.value[0];

    if (anc_active > 1)
    return -EINVAL;
    @@ -607,7 +607,7 @@ static int wm2000_speaker_get(struct snd_kcontrol *kcontrol,
    struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
    struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);

    - ucontrol->value.enumerated.item[0] = wm2000->spk_ena;
    + ucontrol->value.integer.value[0] = wm2000->spk_ena;

    return 0;
    }
    @@ -617,7 +617,7 @@ static int wm2000_speaker_put(struct snd_kcontrol *kcontrol,
    {
    struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
    struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
    - int val = ucontrol->value.enumerated.item[0];
    + int val = ucontrol->value.integer.value[0];

    if (val > 1)
    return -EINVAL;
    --
    1.9.1


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