lkml.org 
[lkml]   [2017]   [Jul]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.12 037/196] ASoC: atmel: tse850: fix off-by-one in the "ANA" enumeration count
    Date
    4.12-stable review patch.  If anyone has any objections, please let me know.

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

    From: Peter Rosin <peda@axentia.se>

    commit a00cebf51d5ceed8ba9f6fac5fb189b38cd5a7c2 upstream.

    At some point I added the "Low" entry at the beginning of the array
    without bumping the enumeration count from 9 to 10. Fix this. While at
    it, fix the anti-pattern for the other enumeration (used by MUX{1,2}).

    Fixes: aa43112445f0 ("ASoC: atmel: tse850: add ASoC driver for the Axentia TSE-850")
    Signed-off-by: Peter Rosin <peda@axentia.se>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/soc/atmel/tse850-pcm5142.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/sound/soc/atmel/tse850-pcm5142.c
    +++ b/sound/soc/atmel/tse850-pcm5142.c
    @@ -227,7 +227,7 @@ int tse850_put_ana(struct snd_kcontrol *
    static const char * const mux_text[] = { "Mixer", "Loop" };

    static const struct soc_enum mux_enum =
    - SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, 2, mux_text);
    + SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, ARRAY_SIZE(mux_text), mux_text);

    static const struct snd_kcontrol_new mux1 =
    SOC_DAPM_ENUM_EXT("MUX1", mux_enum, tse850_get_mux1, tse850_put_mux1);
    @@ -252,7 +252,7 @@ static const char * const ana_text[] = {
    };

    static const struct soc_enum ana_enum =
    - SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, 9, ana_text);
    + SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, ARRAY_SIZE(ana_text), ana_text);

    static const struct snd_kcontrol_new out =
    SOC_DAPM_ENUM_EXT("ANA", ana_enum, tse850_get_ana, tse850_put_ana);

    \
     
     \ /
      Last update: 2017-07-25 22:06    [W:4.210 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site