aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai2013-03-05 08:43:39 -0600
committerGreg Kroah-Hartman2013-03-14 13:26:24 -0500
commit34d8bb52ecd8182b74ed57ac3f17970fb7af024e (patch)
treeffda2f12a6dbf772bae265bb4ee8f4d3bf9aa612 /sound
parente54d986a8fe9daab94cb7faefb352557557c41f0 (diff)
downloadkernel-omap-34d8bb52ecd8182b74ed57ac3f17970fb7af024e.tar.gz
kernel-omap-34d8bb52ecd8182b74ed57ac3f17970fb7af024e.tar.xz
kernel-omap-34d8bb52ecd8182b74ed57ac3f17970fb7af024e.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.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c
index 857586135d18..0097f3619faa 100644
--- a/sound/core/vmaster.c
+++ b/sound/core/vmaster.c
@@ -213,7 +213,10 @@ static int slave_put(struct snd_kcontrol *kcontrol,
213 } 213 }
214 if (!changed) 214 if (!changed)
215 return 0; 215 return 0;
216 return slave_put_val(slave, ucontrol); 216 err = slave_put_val(slave, ucontrol);
217 if (err < 0)
218 return err;
219 return 1;
217} 220}
218 221
219static int slave_tlv_cmd(struct snd_kcontrol *kcontrol, 222static int slave_tlv_cmd(struct snd_kcontrol *kcontrol,