From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 7 Jan 2013 17:21:47 +0000 (+0100)
Subject: ALSA: hda - Handle BOTH jack port as a fixed output
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=fb690cf58278163b464e3ea8b76ad31e07fb140c;p=deliverable%2Flinux.git

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>
---

diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c
index 44c81d34544d..6a01c012a0ae 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;
 		}