Patch "ASoC: dapm: Fix value setting for _ENUM_DOUBLE MUX's second channel" has been added to the 4.4-stable tree
From: <gregkh@linuxfoundation.org>
Date: 2016-10-28 18:17:24
This is a note to let you know that I've just added the patch titled
ASoC: dapm: Fix value setting for _ENUM_DOUBLE MUX's second channel
to the 4.4-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-dapm-fix-value-setting-for-_enum_double-mux-s-second-channel.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let [off-list ref] know about it.
From 071133a209354f39d4e5785d5a6a390e03241841 Mon Sep 17 00:00:00 2001
From: Chen-Yu Tsai <redacted> Date: Sat, 27 Aug 2016 19:27:59 +0800 Subject: ASoC: dapm: Fix value setting for _ENUM_DOUBLE MUX's second channel From: Chen-Yu Tsai <redacted> commit 071133a209354f39d4e5785d5a6a390e03241841 upstream. The value for the second channel in _ENUM_DOUBLE (double channel) MUXs is not correctly updated, due to using the wrong bit shift. Use the correct bit shift, so both channels toggle together. Fixes: 3727b4968453 (ASoC: dapm: Consolidate MUXs and value MUXs) Signed-off-by: Chen-Yu Tsai <redacted> Reviewed-by: Charles Keepax <redacted> Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- sound/soc/soc-dapm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c@@ -3169,7 +3169,7 @@ int snd_soc_dapm_put_enum_double(struct if (e->shift_l != e->shift_r) { if (item[1] > e->items) return -EINVAL; - val |= snd_soc_enum_item_to_val(e, item[1]) << e->shift_l; + val |= snd_soc_enum_item_to_val(e, item[1]) << e->shift_r; mask |= e->mask << e->shift_r; }
Patches currently in stable-queue which might be from wens@csie.org are queue-4.4/asoc-dapm-fix-kcontrol-creation-for-output-driver-widget.patch queue-4.4/asoc-dapm-fix-value-setting-for-_enum_double-mux-s-second-channel.patch queue-4.4/asoc-dapm-fix-possible-uninitialized-variable-in-snd_soc_dapm_get_volsw.patch