diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-01-07 18:21:47 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-01-12 08:44:13 +0100 |
| commit | fb690cf58278163b464e3ea8b76ad31e07fb140c (patch) | |
| tree | 702d84a4a3e4a252085b944cde2632f577a751cc /sound/pci/hda/hda_auto_parser.c | |
| parent | 3ca529d339f1904b68c6251172522302fca77b28 (diff) | |
ALSA: hda - Handle BOTH jack port as a fixed output
When the default config value shows the connection AC_JACK_PORT_BOTH,
it's better to handle it as a speaker pin. This makes the behavior
consistent in snd_hda_get_pin_label() and snd_hda_parse_pin_defcfg().
There are only few old machines showing this attribute, and all of
them are actually fixed speaker pins, as far as I know.
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c index 44c81d34544..6a01c012a0a 100644 --- a/sound/pci/hda/hda_auto_parser.c +++ b/sound/pci/hda/hda_auto_parser.c @@ -156,7 +156,8 @@ int snd_hda_parse_pin_defcfg(struct hda_codec *codec, /* workaround for buggy BIOS setups */ if (dev == AC_JACK_LINE_OUT) { - if (conn == AC_JACK_PORT_FIXED) + if (conn == AC_JACK_PORT_FIXED || + conn == AC_JACK_PORT_BOTH) dev = AC_JACK_SPEAKER; } |