diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-03-18 11:04:42 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-03-18 11:04:42 +0100 |
| commit | cf30f46acde1f84fbf603bba6540cbb40cc6c954 (patch) | |
| tree | 2652b3fd1fbc4c379ee5325579fe60eae75421f1 /sound/core/vmaster.c | |
| parent | 0959f22ee66734c212fc733f7616ba321ef7f47f (diff) | |
| parent | a86b1a2cd2f81f74e815e07f756edd7bc5b6f034 (diff) | |
Merge branch 'for-linus' into for-next
Back-merged for refactoring beep stuff.
Diffstat (limited to 'sound/core/vmaster.c')
| -rw-r--r-- | sound/core/vmaster.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c index 55c9d8c8d3c..02f90b4f8b8 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, |