diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-09-26 10:41:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 11:41:07 -0700 |
| commit | 603a77a2233681fff6db6905a37a7525ef1e5fa5 (patch) | |
| tree | 4da4fb32a25ae7a46245dd568ce46b1df8a91ee0 /sound/pci | |
| parent | 906a1b1a9e2538e45e13d111eb7927ab9c54b4b0 (diff) | |
| download | kernel_samsung_smdk4412-603a77a2233681fff6db6905a37a7525ef1e5fa5.zip kernel_samsung_smdk4412-603a77a2233681fff6db6905a37a7525ef1e5fa5.tar.gz kernel_samsung_smdk4412-603a77a2233681fff6db6905a37a7525ef1e5fa5.tar.bz2 | |
ALSA: hda/realtek - Avoid bogus HP-pin assignment
commit 5fe6e0151dbd969f5fbcd94d05c968b76d76952b upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 95e1ff3..4c7cd6b 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -1859,7 +1859,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) |