Patch "ASoC: atmel: tse850: fix off-by-one in the "ANA" enumeration count" has been added to the 4.12-stable tree
Subsystems (6)
This is a note to let you know that I've just added the patch titled
ASoC: atmel: tse850: fix off-by-one in the "ANA" enumeration count
to the 4.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
asoc-atmel-tse850-fix-off-by-one-in-the-ana-enumeration-count.patch
and it can be found in the queue-4.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
a00cebf51d5ceed8ba9f6fac5fb189b38cd5a7c2Mon Sep 17 00:00:00 2001
From: Peter Rosin <[email protected]>
Date: Wed, 31 May 2017 14:32:33 +0200
Subject: ASoC: atmel: tse850: fix off-by-one in the "ANA" enumeration count
From: Peter Rosin <[email protected]>
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}).
--- sound/soc/atmel/tse850-pcm5142.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/atmel/tse850-pcm5142.c +2 -2
@@ -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);
Patches currently in stable-queue which might be from [email protected] are
queue-4.12/asoc-atmel-tse850-fix-off-by-one-in-the-ana-enumeration-count.patch