---

yaml --- r: 360952 b: refs/heads/master c: 2069d48 h: refs/heads/master v: v3
git-mirror · Mar 5, 2013 · 36981ab · 36981ab
1 parent ed61cb8
commit 36981ab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85c50a5899b23f4f893b0898b286023157b98376
+refs/heads/master: 2069d483b39a603a5f3428a19d3b4ac89aa97f48
diff --git a/trunk/sound/core/vmaster.c b/trunk/sound/core/vmaster.c
@@ -213,7 +213,10 @@ static int slave_put(struct snd_kcontrol *kcontrol,
 	}
 	if (!changed)
 		return 0;
-	return slave_put_val(slave, ucontrol);
+	err = slave_put_val(slave, ucontrol);
+	if (err < 0)
+		return err;
+	return 1;
 }
 
 static int slave_tlv_cmd(struct snd_kcontrol *kcontrol,