path: root/sound
diff options
authorTakashi Iwai <tiwai@suse.de>2013-10-25 23:43:10 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-13 12:05:32 +0900
commit8fde18bd74c8f30094bc47edf2c9ed19478661de (patch)
tree7dd20d259b16e7f9863724b59b7723b5613ef9a5 /sound
parent40a894023d9a4c58379eb4f2ac12e40a2fe014d3 (diff)
ALSA: hda - Add missing initial vmaster hook at build_controls callback
commit b63eae0a6c84839275a4638a7baa391be965cd0e upstream. The generic parser has a support of vmaster hook, but this is initialized only in the init callback with the check of the presence of the corresponding kctl. However, since kctl is NULL at the very first init callback that is called before build_controls callback, the vmaster hook sync is skipped there. Eventually this leads to the uninitialized state depending on the hook implementation. This patch adds a simple workaround, just calling the sync function explicitly at build_controls callback. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 2519f9d03c0..d0cc796f778 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -4383,9 +4383,11 @@ int snd_hda_gen_build_controls(struct hda_codec *codec)
true, &spec->vmaster_mute.sw_kctl);
if (err < 0)
return err;
- if (spec->vmaster_mute.hook)
+ if (spec->vmaster_mute.hook) {
snd_hda_add_vmaster_hook(codec, &spec->vmaster_mute,
+ snd_hda_sync_vmaster_hook(&spec->vmaster_mute);
+ }
free_kctls(spec); /* no longer needed */