mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 12:28:41 +08:00
ALSA: hda - Fix headphone-detect regression with multiple HP jacks
The recent changes over the DAC detection mechanism in patch_sigmatel.c breaks the HP detection on the machines with multiple HP jacks. It's basically because of the workaround to support the multi-channel output. Since the HP detection is more important feature, disable the HP-swap workaroud temporarily. Reference: Novell bnc#482052 https://bugzilla.novell.com/show_bug.cgi?id=482052 Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
14b97595e0
commit
c50ff7c042
@ -3516,6 +3516,7 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
|
||||
if (! spec->autocfg.line_outs)
|
||||
return 0; /* can't find valid pin config */
|
||||
|
||||
#if 0 /* FIXME: temporarily disabled */
|
||||
/* If we have no real line-out pin and multiple hp-outs, HPs should
|
||||
* be set up as multi-channel outputs.
|
||||
*/
|
||||
@ -3535,6 +3536,7 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
|
||||
spec->autocfg.line_out_type = AUTO_PIN_HP_OUT;
|
||||
spec->autocfg.hp_outs = 0;
|
||||
}
|
||||
#endif /* FIXME: temporarily disabled */
|
||||
if (spec->autocfg.mono_out_pin) {
|
||||
int dir = get_wcaps(codec, spec->autocfg.mono_out_pin) &
|
||||
(AC_WCAP_OUT_AMP | AC_WCAP_IN_AMP);
|
||||
|
Loading…
Reference in New Issue
Block a user