summaryrefslogtreecommitdiffstats
path: root/sound/core/vmaster.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-07-03 14:01:32 +0200
committerTakashi Iwai <tiwai@suse.de>2013-07-03 14:01:32 +0200
commit1ba65ae4bdbd43265c51ee4c30ff21a48124b6d8 (patch)
tree07074f0151573ca441c8e7d230c7b4e14e4179b3 /sound/core/vmaster.c
parent05843c07ee501cc89a484b2d02528282838a2318 (diff)
downloadlinux-1ba65ae4bdbd43265c51ee4c30ff21a48124b6d8.tar.bz2
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 <tiwai@suse.de>
Diffstat (limited to 'sound/core/vmaster.c')
-rw-r--r--sound/core/vmaster.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c
index 5df8dc25ad80..842a97d5fc3a 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;
}