ASoC: core: Double control update err for snd_soc_put_volsw_sx

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 <[email protected]> Signed-off-by: Mark Brown <[email protected]> Cc: [email protected]
cbmeeks · Nov 9, 2012 · d055852 · d055852
1 parent 445632a
commit d055852
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/sound/soc/soc-core.c b/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;