summaryrefslogtreecommitdiff
path: root/sound/pci/hda/hda_generic.c
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2013-04-11 11:30:28 +0200
committerTakashi Iwai <tiwai@suse.de>2013-04-11 11:59:20 +0200
commitcb420b1186e0090f24137855e14e6f3bf7cb769d (patch)
treeebd0bbf1c57e79562dda04a9deca0194f10d3316 /sound/pci/hda/hda_generic.c
parent01f9326ae4087bd278783811e5e6b6c0058dd455 (diff)
downloadlinux-cb420b1186e0090f24137855e14e6f3bf7cb769d.tar.gz
ALSA: hda - allow "Headphone Mic" parser flag
This allows a specific mic to get the "Headphone Mic" name, in addition to the existing "Headset Mic" name. Also, it allows for a special mark: if the sequence number is set to 0xc, that's an indication to prefer it for headset mic, and if it's set to 0xd, that's an indication to prefer it for headphone mic. Signed-off-by: David Henningsson <david.henningsson@canonical.com> 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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index f0a422f5ea45..cc22d754843c 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -2333,6 +2333,7 @@ static int create_hp_mic(struct hda_codec *codec)
cfg->inputs[cfg->num_inputs].pin = nid;
cfg->inputs[cfg->num_inputs].type = AUTO_PIN_MIC;
+ cfg->inputs[cfg->num_inputs].is_headphone_mic = 1;
cfg->num_inputs++;
spec->hp_mic = 1;
spec->hp_mic_pin = nid;