From: Takashi Iwai Date: Tue, 5 Mar 2013 14:43:39 +0000 (+0100) Subject: ALSA: vmaster: Fix slave change notification X-Git-Tag: v3.2.41~56 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=80e841638927953e753fa80b95077a3e88caab61 ALSA: vmaster: Fix slave change notification commit 2069d483b39a603a5f3428a19d3b4ac89aa97f48 upstream. 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. Signed-off-by: Takashi Iwai Signed-off-by: Ben Hutchings --- diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c index 130cfe677d60..ac0af035f911 100644 --- a/sound/core/vmaster.c +++ b/sound/core/vmaster.c @@ -209,7 +209,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,