From 15f7d432d29bb04a0b9ab06fa7952a9cd0e3a552 Mon Sep 17 00:00:00 2001
From: Mukund Navada <navada@ti.com>
Date: Fri, 9 Nov 2012 11:53:40 +0530
Subject: [PATCH] --- yaml --- r: 335633 b: refs/heads/master c:
 d055852ee86703d48b0c571e94bd2eb33aa9b91d h: refs/heads/master i:   335631:
 9928a432a98f80ae68542c31e8901363cd386258 v: v3

---
 [refs]                     | 2 +-
 trunk/sound/soc/soc-core.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

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;