]>
Commit | Line | Data |
---|---|---|
2cb7cef9 BS |
1 | From 1c4bdf9be010ae7c2324c0a90dd2296e0d1a775e Mon Sep 17 00:00:00 2001 |
2 | From: Takashi Iwai <tiwai@suse.de> | |
3 | Date: Thu, 13 Aug 2009 08:23:24 +0200 | |
4 | Subject: ALSA: hda - Enable line-out detection only with speakers | |
5 | Patch-mainline: | |
6 | References: bnc#520975 | |
7 | ||
8 | Enable line-out detection for IDT/STAC codecs only when speaker pins | |
9 | exist. In some cases, the speaker itself is identified as line-out, | |
10 | and this confuses the situation. Only the extra line-outs should do | |
11 | auto-muting. | |
12 | ||
13 | Signed-off-by: Takashi Iwai <tiwai@suse.de> | |
14 | ||
15 | --- | |
16 | sound/pci/hda/patch_sigmatel.c | 3 ++- | |
17 | 1 file changed, 2 insertions(+), 1 deletion(-) | |
18 | ||
19 | --- a/sound/pci/hda/patch_sigmatel.c | |
20 | +++ b/sound/pci/hda/patch_sigmatel.c | |
21 | @@ -4158,7 +4158,8 @@ | |
22 | hda_nid_t nid = cfg->hp_pins[i]; | |
23 | enable_pin_detect(codec, nid, STAC_HP_EVENT); | |
24 | } | |
25 | - if (cfg->line_out_type == AUTO_PIN_LINE_OUT) { | |
26 | + if (cfg->line_out_type == AUTO_PIN_LINE_OUT && | |
27 | + cfg->speaker_outs > 0) { | |
28 | /* enable pin-detect for line-outs as well */ | |
29 | for (i = 0; i < cfg->line_outs; i++) { | |
30 | hda_nid_t nid = cfg->line_out_pins[i]; |