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.10 06/23] ASoC: wm2000: Fix wrong value references for boolean kctl
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

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

    From: Takashi Iwai <tiwai@suse.de>

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

    --- a/sound/soc/codecs/wm2000.c
    +++ b/sound/soc/codecs/wm2000.c
    @@ -605,7 +605,7 @@ static int wm2000_anc_mode_get(struct sn
    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;
    }
    @@ -615,7 +615,7 @@ static int wm2000_anc_mode_put(struct sn
    {
    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];
    int ret;

    if (anc_active > 1)
    @@ -638,7 +638,7 @@ static int wm2000_speaker_get(struct snd
    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;
    }
    @@ -648,7 +648,7 @@ static int wm2000_speaker_put(struct snd
    {
    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];
    int ret;

    if (val > 1)



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