summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-19 14:24:13 +0100
committerTakashi Iwai <tiwai@suse.de>2008-12-19 14:24:13 +0100
commit03c6901ea22bbb532586334d5b79941ccf56d5b0 (patch)
tree54b8bc8f2dfab3db199b545a45bff5493eab4221
parentALSA: hda - Fix HD-Audio.txt reference of model list (diff)
parentALSA: hda - Remove non-working headphone control for Dell laptops (diff)
downloadlinux-03c6901ea22bbb532586334d5b79941ccf56d5b0.tar.xz
linux-03c6901ea22bbb532586334d5b79941ccf56d5b0.zip
Merge branch 'fix/hda' into topic/hda
-rw-r--r--sound/pci/hda/patch_sigmatel.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 31662c65e8fd..b7b419691803 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -2979,7 +2979,7 @@ static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec,
}
if ((spec->multiout.num_dacs - cfg->line_outs) > 0 &&
- cfg->hp_outs && !spec->multiout.hp_nid)
+ cfg->hp_outs == 1 && !spec->multiout.hp_nid)
spec->multiout.hp_nid = nid;
if (cfg->hp_outs > 1 && cfg->line_out_type == AUTO_PIN_LINE_OUT) {
@@ -4598,6 +4598,7 @@ again:
spec->amp_nids = &stac92hd73xx_amp_nids[DELL_M6_AMP];
spec->eapd_switch = 0;
spec->num_amps = 1;
+ spec->multiout.hp_nid = 0; /* dual HPs */
if (!spec->init)
spec->init = dell_m6_core_init;