diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-03-05 15:43:39 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-14 11:32:05 -0700 |
| commit | 50a885c6f03d574acc5d88728ce5a8f4bb3df9fe (patch) | |
| tree | 491e5a81c8938b03b166b36566c1853e39eb0680 /sound | |
| parent | 30061508a22179630a1fedbb435a5cfb6d975aaa (diff) | |
| download | kernel_samsung_smdk4412-50a885c6f03d574acc5d88728ce5a8f4bb3df9fe.tar.gz kernel_samsung_smdk4412-50a885c6f03d574acc5d88728ce5a8f4bb3df9fe.tar.bz2 kernel_samsung_smdk4412-50a885c6f03d574acc5d88728ce5a8f4bb3df9fe.zip | |
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 <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
| -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 a39d3d8c2f9..6058a371f0d 100644 --- a/sound/core/vmaster.c +++ b/sound/core/vmaster.c @@ -207,7 +207,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, |