lkml.org 
[lkml]   [2012]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 084/241] ASoC: core: Double control update err for snd_soc_put_volsw_sx
    Date
    3.5.7.2 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Mukund Navada <navada@ti.com>

    commit d055852ee86703d48b0c571e94bd2eb33aa9b91d upstream.

    snd_soc_put_volsw_sx function fails to update second control
    if first control is updated by snd_soc_update_bits_locked.

    Signed-off-by: Mukund Navada <navada@ti.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
    ---
    sound/soc/soc-core.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
    index b37ee80..ed038b9 100644
    --- a/sound/soc/soc-core.c
    +++ b/sound/soc/soc-core.c
    @@ -2692,8 +2692,9 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol,
    val = (ucontrol->value.integer.value[0] + min) & mask;
    val = val << shift;

    - if (snd_soc_update_bits_locked(codec, reg, val_mask, val))
    - return err;
    + err = snd_soc_update_bits_locked(codec, reg, val_mask, val);
    + if (err < 0)
    + return err;

    if (snd_soc_volsw_is_stereo(mc)) {
    val_mask = mask << rshift;
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-12-13 15:21    [W:3.441 / U:0.360 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site