path: root/sound
diff options
authorTakashi Iwai <tiwai@suse.de>2013-03-05 15:43:39 +0100
committerTakashi Iwai <tiwai@suse.de>2013-03-05 15:43:39 +0100
commit2069d483b39a603a5f3428a19d3b4ac89aa97f48 (patch)
tree0d8e0ea4dbd52498b774e82ff2593262f86f6af4 /sound
parent85c50a5899b23f4f893b0898b286023157b98376 (diff)
ALSA: vmaster: Fix slave change notification
When a value of a vmaster slave control is changed, the ctl change notification is sometimes ignored. This happens when the master control overrides, e.g. when the corresponding master control is muted. The reason is that slave_put() returns the value of the actual slave put callback, and it doesn't reflect the virtual slave value change. This patch fixes the function just to return 1 whenever a slave value is changed. Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c
index 857586135d1..0097f3619fa 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,