diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-01-09 11:46:34 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-01-12 11:44:18 +0400 |
| commit | 54d778b31c98b305bf47fbbabd4107a3898ebe66 (patch) | |
| tree | 1420025965b8e5b1ebcde7b9ce10a71c416ea41a /sound/pci/hda/hda_auto_parser.c | |
| parent | ca29683bd63a463d48934dc5b50ec4aecbfaa7c2 (diff) | |
| download | linux-54d778b31c98b305bf47fbbabd4107a3898ebe66.tar.xz | |
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: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_auto_parser.c')
| -rw-r--r-- | sound/pci/hda/hda_auto_parser.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c index 6a01c012a0ae..e5b20219d850 100644 --- a/sound/pci/hda/hda_auto_parser.c +++ b/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"; } |