summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-09-26 10:41:21 +0200
committerTakashi Iwai <tiwai@suse.de>2011-09-26 11:13:43 +0200
commit5fe6e0151dbd969f5fbcd94d05c968b76d76952b (patch)
treeae01e7300eac1df99b1be683c8906f5b6cc56e57 /sound
parent6656b15d675c9c6a049db48d50994b3cd4e76bd6 (diff)
downloadlinux-3.10-5fe6e0151dbd969f5fbcd94d05c968b76d76952b.tar.gz
linux-3.10-5fe6e0151dbd969f5fbcd94d05c968b76d76952b.tar.bz2
linux-3.10-5fe6e0151dbd969f5fbcd94d05c968b76d76952b.zip
ALSA: hda/realtek - Avoid bogus HP-pin assignment
When the headphone pin is assigned as primary output to line_out_pins[], the automatic HP-pin assignment by ASSID must be suppressed. Otherwise a wrong pin might be assigned to the headphone and breaks the auto-mute. Reference: https://bugzilla.novell.com/show_bug.cgi?id=716104 Signed-off-by: Takashi Iwai <tiwai@suse.de> Cc: <stable@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_realtek.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 0503c999e7d..91a538173c9 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1321,7 +1321,9 @@ do_sku:
* 15 : 1 --> enable the function "Mute internal speaker
* when the external headphone out jack is plugged"
*/
- if (!spec->autocfg.hp_pins[0]) {
+ if (!spec->autocfg.hp_pins[0] &&
+ !(spec->autocfg.line_out_pins[0] &&
+ spec->autocfg.line_out_type == AUTO_PIN_HP_OUT)) {
hda_nid_t nid;
tmp = (ass >> 11) & 0x3; /* HP to chassis */
if (tmp == 0)