From 1ba65ae4bdbd43265c51ee4c30ff21a48124b6d8 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 3 Jul 2013 14:01:32 +0200 Subject: ALSA: vmaster: Fix the regression of missing vmaster hook call The commit [1ca2f2ec: ALSA: vmaster: Add snd_ctl_sync_vmaster() helper function] changed master_put() function and the check for the required vmaster hook call is wrongly performed now, which results in the missing hook call upon "Master Playback Switch" value changes. This patch corrects the check logic. Signed-off-by: Takashi Iwai --- sound/core/vmaster.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c index 5df8dc25ad8..842a97d5fc3 100644 --- a/sound/core/vmaster.c +++ b/sound/core/vmaster.c @@ -348,7 +348,7 @@ static int master_put(struct snd_kcontrol *kcontrol, err = sync_slaves(master, old_val, new_val); if (err < 0) return err; - if (master->hook && first_init) + if (master->hook && !first_init) master->hook(master->hook_private_data, master->val); return 1; } -- cgit v1.2.3-70-g09d2