lkml.org 
[lkml]   [2016]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 118/142] ASoC: wm_adsp: Fix enum ctl accesses in a wrong type
    Date
    3.16.7-ckt26 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Takashi Iwai <tiwai@suse.de>

    commit 15c665700bf6f4543f003ac0fbb1e9ec692e93f2 upstream.

    The firmware ctls like "DSP1 Firmware" in wm_adsp codec driver are
    enum, while the current driver accesses wrongly via
    value.integer.value[]. They have to be via value.enumerated.item[]
    instead.

    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    [ luis: backported to 3.16: adjusted context ]
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    sound/soc/codecs/wm_adsp.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
    index 051350052d62..51bdb4765b41 100644
    --- a/sound/soc/codecs/wm_adsp.c
    +++ b/sound/soc/codecs/wm_adsp.c
    @@ -246,7 +246,7 @@ static int wm_adsp_fw_get(struct snd_kcontrol *kcontrol,
    struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
    struct wm_adsp *adsp = snd_soc_codec_get_drvdata(codec);

    - ucontrol->value.integer.value[0] = adsp[e->shift_l].fw;
    + ucontrol->value.enumerated.item[0] = adsp[e->shift_l].fw;

    return 0;
    }
    @@ -258,16 +258,16 @@ static int wm_adsp_fw_put(struct snd_kcontrol *kcontrol,
    struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
    struct wm_adsp *adsp = snd_soc_codec_get_drvdata(codec);

    - if (ucontrol->value.integer.value[0] == adsp[e->shift_l].fw)
    + if (ucontrol->value.enumerated.item[0] == adsp[e->shift_l].fw)
    return 0;

    - if (ucontrol->value.integer.value[0] >= WM_ADSP_NUM_FW)
    + if (ucontrol->value.enumerated.item[0] >= WM_ADSP_NUM_FW)
    return -EINVAL;

    if (adsp[e->shift_l].running)
    return -EBUSY;

    - adsp[e->shift_l].fw = ucontrol->value.integer.value[0];
    + adsp[e->shift_l].fw = ucontrol->value.enumerated.item[0];

    return 0;
    }
    \
     
     \ /
      Last update: 2016-03-22 12:41    [W:2.336 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site