lkml.org 
[lkml]   [2017]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 027/306] ASoC: dapm: Fix value setting for _ENUM_DOUBLE MUX's second channel
    3.16.40-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Chen-Yu Tsai <wens@csie.org>

    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 <wens@csie.org>
    Reviewed-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    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
    @@ -2870,7 +2870,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;
    }

    \
     
     \ /
      Last update: 2017-02-16 01:02    [W:4.182 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site