summaryrefslogtreecommitdiff
path: root/sound/pci/hda/hda_generic.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-12-20 14:57:18 +0100
committerTakashi Iwai <tiwai@suse.de>2013-01-12 08:34:12 +0100
commitfd25a97a97c78e7f09b0b3069a40bf7671654366 (patch)
treeb667629e1229449ca3ce15de7e454297f70998a8 /sound/pci/hda/hda_generic.c
parent406b285da3a04381d46d0f5f5e53c3de0362738c (diff)
downloadlwn-fd25a97a97c78e7f09b0b3069a40bf7671654366.tar.gz
lwn-fd25a97a97c78e7f09b0b3069a40bf7671654366.zip
ALSA: hda - Add spec->vmaster_mute_enum flag to generic parser
Add a flag to indicate whether the vmaster mute hook enum is exposed or not. Conexant codecs may want not to expose the control depending on the model. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_generic.c')
-rw-r--r--sound/pci/hda/hda_generic.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 6fb454eda97f..a5c4bc05d16f 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -2966,7 +2966,8 @@ int snd_hda_gen_build_controls(struct hda_codec *codec)
if (err < 0)
return err;
if (spec->vmaster_mute.hook)
- snd_hda_add_vmaster_hook(codec, &spec->vmaster_mute, true);
+ snd_hda_add_vmaster_hook(codec, &spec->vmaster_mute,
+ spec->vmaster_mute_enum);
}
free_kctls(spec); /* no longer needed */