| Message ID | 20160827112801.31010-3-wens@csie.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 071133a209354f39d4e5785d5a6a390e03241841 |
| Headers | show |
On Sat, Aug 27, 2016 at 07:27:59PM +0800, Chen-Yu Tsai wrote: > 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 <wens@csie.org> > --- Reviewed-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Thanks, Charles
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 0b442fee0b62..9be076bc14b5 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3203,7 +3203,7 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol, 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; }
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 <wens@csie.org> --- sound/soc/soc-dapm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)