diff --git a/[refs] b/[refs] index d5b52f3651b8..86356be9c17e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 445632ad6dda42f4d3f9df2569a852ca0d4ea608 +refs/heads/master: d055852ee86703d48b0c571e94bd2eb33aa9b91d diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c index d1198627fc40..10d21be383f6 100644 --- a/trunk/sound/soc/soc-core.c +++ b/trunk/sound/soc/soc-core.c @@ -2786,8 +2786,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;