From 032a1ac46dbeee39d77654b2856000950ab092d7 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 9 Jan 2013 08:46:34 +0100 Subject: [PATCH] --- yaml --- r: 353109 b: refs/heads/master c: 54d778b31c98b305bf47fbbabd4107a3898ebe66 h: refs/heads/master i: 353107: a0a87567bf3e90d133100e32558d1e44beed641e v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_auto_parser.c | 2 ++ trunk/sound/pci/hda/hda_generic.c | 4 ---- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5f7d54a9352e..d1c152e88a56 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca29683bd63a463d48934dc5b50ec4aecbfaa7c2 +refs/heads/master: 54d778b31c98b305bf47fbbabd4107a3898ebe66 diff --git a/trunk/sound/pci/hda/hda_auto_parser.c b/trunk/sound/pci/hda/hda_auto_parser.c index 6a01c012a0ae..e5b20219d850 100644 --- a/trunk/sound/pci/hda/hda_auto_parser.c +++ b/trunk/sound/pci/hda/hda_auto_parser.c @@ -395,6 +395,8 @@ static const char *hda_get_input_pin_label(struct hda_codec *codec, return "SPDIF In"; case AC_JACK_DIG_OTHER_IN: return "Digital In"; + case AC_JACK_HP_OUT: + return "Headphone Mic"; default: return "Misc"; } diff --git a/trunk/sound/pci/hda/hda_generic.c b/trunk/sound/pci/hda/hda_generic.c index f07b32668f42..aa4e6398e3b4 100644 --- a/trunk/sound/pci/hda/hda_generic.c +++ b/trunk/sound/pci/hda/hda_generic.c @@ -2085,8 +2085,6 @@ static int create_input_ctls(struct hda_codec *codec) continue; label = hda_get_autocfg_input_label(codec, cfg, i); - if (spec->shared_mic_hp && !strcmp(label, "Misc")) - label = "Headphone Mic"; if (prev_label && !strcmp(label, prev_label)) type_idx++; else @@ -2540,8 +2538,6 @@ static int parse_mic_boost(struct hda_codec *codec) unsigned int val; label = hda_get_autocfg_input_label(codec, cfg, i); - if (spec->shared_mic_hp && !strcmp(label, "Misc")) - label = "Headphone Mic"; if (prev_label && !strcmp(label, prev_label)) type_idx++; else