aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-01-23 12:23:36 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-03 12:18:49 -0500
commita3c9ccb3e13812e13be045a97ab309a4e23d9ac4 (patch)
treefc5aa862e795e0bb3406e95ff134fce78da4dc42 /sound/pci
parent235eae6e5e402f5f723203e4444f10c16c7c3be3 (diff)
ALSA: hda - Fix silent outputs from docking-station jacks of Dell laptops
commit b4ead019afc201f71c39cd0dfcaafed4a97b3dd2 upstream. The recent change of the power-widget handling for IDT codecs caused the silent output from the docking-station line-out jack. This was partially fixed by the commit f2cbba7602383cd9cdd21f0a5d0b8bd1aad47b33 "ALSA: hda - Fix the lost power-setup of seconary pins after PM resume". But the line-out on the docking-station is still silent when booted with the jack plugged even by this fix. The remainig bug is that the power-widget is set off in stac92xx_init() because the pins in cfg->line_out_pins[] aren't checked there properly but only hp_pins[] are checked in is_nid_hp_pin(). This patch fixes the problem by checking both HP and line-out pins and leaving the power-map correctly. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=42637 Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_sigmatel.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 0d8db75535d..43d88c72493 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -4162,13 +4162,15 @@ static int enable_pin_detect(struct hda_codec *codec, hda_nid_t nid,
4162 return 1; 4162 return 1;
4163} 4163}
4164 4164
4165static int is_nid_hp_pin(struct auto_pin_cfg *cfg, hda_nid_t nid) 4165static int is_nid_out_jack_pin(struct auto_pin_cfg *cfg, hda_nid_t nid)
4166{ 4166{
4167 int i; 4167 int i;
4168 for (i = 0; i < cfg->hp_outs; i++) 4168 for (i = 0; i < cfg->hp_outs; i++)
4169 if (cfg->hp_pins[i] == nid) 4169 if (cfg->hp_pins[i] == nid)
4170 return 1; /* nid is a HP-Out */ 4170 return 1; /* nid is a HP-Out */
4171 4171 for (i = 0; i < cfg->line_outs; i++)
4172 if (cfg->line_out_pins[i] == nid)
4173 return 1; /* nid is a line-Out */
4172 return 0; /* nid is not a HP-Out */ 4174 return 0; /* nid is not a HP-Out */
4173}; 4175};
4174 4176
@@ -4354,7 +4356,7 @@ static int stac92xx_init(struct hda_codec *codec)
4354 continue; 4356 continue;
4355 } 4357 }
4356 4358
4357 if (is_nid_hp_pin(cfg, nid)) 4359 if (is_nid_out_jack_pin(cfg, nid))
4358 continue; /* already has an unsol event */ 4360 continue; /* already has an unsol event */
4359 4361
4360 pinctl = snd_hda_codec_read(codec, nid, 0, 4362 pinctl = snd_hda_codec_read(codec, nid, 0,