---

yaml --- r: 335633 b: refs/heads/master c: d055852 h: refs/heads/master i: 335631: 9928a43 v: v3
git-mirror · Nov 9, 2012 · 15f7d43 · 15f7d43
1 parent 1fda42c
commit 15f7d43
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;