From 2a01e7341ad7c55ff465d91e30f9524d4b9b5522 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 15 Jun 2010 15:14:31 +0100
Subject: [PATCH] --- yaml --- r: 206559 b: refs/heads/master c:
 f1df5aec68946e427eb4884c4d80e3259361478c h: refs/heads/master i:   206557:
 7ea2f12512d2f1bd78365a505c4d3bf7b0a5961a   206555:
 7776f9bca9b851dbd561ab59fcaa2ae68c255776   206551:
 00a2b7f6f98f48ae79809568268834852aa00ca4   206543:
 7c0a478c78bf0b65f9de4e455a5c940fa88c355a   206527:
 96a08ff29cfb02f1a34ed6bc93c9669ebf1b0a7a v: v3

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

diff --git a/[refs] b/[refs]
index b86bbc6e0179..ccfb5f390eef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e71fa370428aa80e3acc3a49f8df1e76e7719347
+refs/heads/master: f1df5aec68946e427eb4884c4d80e3259361478c
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
index 254dd1c6914d..26f17323ef19 100644
--- a/trunk/sound/soc/soc-core.c
+++ b/trunk/sound/soc/soc-core.c
@@ -2433,14 +2433,12 @@ int snd_soc_put_volsw_2r_sx(struct snd_kcontrol *kcontrol,
 	if (oval != val) {
 		ret = snd_soc_write(codec, mc->reg, val);
 		if (ret < 0)
-			return 0;
-		ret = 1;
+			return ret;
 	}
 	if (ovalr != valr) {
 		ret = snd_soc_write(codec, mc->rreg, valr);
 		if (ret < 0)
-			return 0;
-		ret = 1;
+			return ret;
 	}
 
 	return 0;