Commit 54d778b3 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda - Return "Headphone Mic" from hda_get_autocfg_input_label()

Instead of handling special cases in the caller side, give a proper
name string "Headphone Mic" from hda_get_autocfg_input_label() when
the headhpone jack pin is specified as an input.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ca29683b
...@@ -395,6 +395,8 @@ static const char *hda_get_input_pin_label(struct hda_codec *codec, ...@@ -395,6 +395,8 @@ static const char *hda_get_input_pin_label(struct hda_codec *codec,
return "SPDIF In"; return "SPDIF In";
case AC_JACK_DIG_OTHER_IN: case AC_JACK_DIG_OTHER_IN:
return "Digital In"; return "Digital In";
case AC_JACK_HP_OUT:
return "Headphone Mic";
default: default:
return "Misc"; return "Misc";
} }
......
...@@ -2085,8 +2085,6 @@ static int create_input_ctls(struct hda_codec *codec) ...@@ -2085,8 +2085,6 @@ static int create_input_ctls(struct hda_codec *codec)
continue; continue;
label = hda_get_autocfg_input_label(codec, cfg, i); 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)) if (prev_label && !strcmp(label, prev_label))
type_idx++; type_idx++;
else else
...@@ -2540,8 +2538,6 @@ static int parse_mic_boost(struct hda_codec *codec) ...@@ -2540,8 +2538,6 @@ static int parse_mic_boost(struct hda_codec *codec)
unsigned int val; unsigned int val;
label = hda_get_autocfg_input_label(codec, cfg, i); 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)) if (prev_label && !strcmp(label, prev_label))
type_idx++; type_idx++;
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment