Merge branch 'for-linus' into for-next

Back-merged for refactoring beep stuff.

1 files changed, 4 insertions, 1 deletions

diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c
index 55c9d8c8d3c1..02f90b4f8b86 100644
--- a/sound/core/vmaster.c
+++ b/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,