lkml.org 
[lkml]   [2015]   [May]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 127/221] ASoC: wm8960: Fix wrong value references for boolean kctl
    3.2.69-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Takashi Iwai <tiwai@suse.de>

    commit b4a18c8b1af15ebfa9054a3d2aef7b0a7e6f2a05 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: Ben Hutchings <ben@decadent.org.uk>
    ---
    sound/soc/codecs/wm8960.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/sound/soc/codecs/wm8960.c
    +++ b/sound/soc/codecs/wm8960.c
    @@ -135,7 +135,7 @@ static int wm8960_get_deemph(struct snd_
    struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
    struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);

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

    @@ -144,7 +144,7 @@ static int wm8960_put_deemph(struct snd_
    {
    struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
    struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
    - int deemph = ucontrol->value.enumerated.item[0];
    + int deemph = ucontrol->value.integer.value[0];

    if (deemph > 1)
    return -EINVAL;


    \
     
     \ /
      Last update: 2015-05-05 04:01    [W:4.043 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site