---

yaml --- r: 206559 b: refs/heads/master c: f1df5ae h: refs/heads/master i: 206557: 7ea2f12 206555: 7776f9b 206551: 00a2b7f 206543: 7c0a478 206527: 96a08ff v: v3
git-mirror · Jun 16, 2010 · 2a01e73 · 2a01e73
1 parent 3349f74
commit 2a01e73
Show file tree

Hide file tree

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