aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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,
2979 } 2979 }
2980 2980
2981 if ((spec->multiout.num_dacs - cfg->line_outs) > 0 && 2981 if ((spec->multiout.num_dacs - cfg->line_outs) > 0 &&
2982 cfg->hp_outs && !spec->multiout.hp_nid) 2982 cfg->hp_outs == 1 && !spec->multiout.hp_nid)
2983 spec->multiout.hp_nid = nid; 2983 spec->multiout.hp_nid = nid;
2984 2984
2985 if (cfg->hp_outs > 1 && cfg->line_out_type == AUTO_PIN_LINE_OUT) { 2985 if (cfg->hp_outs > 1 && cfg->line_out_type == AUTO_PIN_LINE_OUT) {
@@ -4598,6 +4598,7 @@ again:
4598 spec->amp_nids = &stac92hd73xx_amp_nids[DELL_M6_AMP]; 4598 spec->amp_nids = &stac92hd73xx_amp_nids[DELL_M6_AMP];
4599 spec->eapd_switch = 0; 4599 spec->eapd_switch = 0;
4600 spec->num_amps = 1; 4600 spec->num_amps = 1;
4601 spec->multiout.hp_nid = 0; /* dual HPs */
4601 4602
4602 if (!spec->init) 4603 if (!spec->init)
4603 spec->init = dell_m6_core_init; 4604 spec->init = dell_m6_core_init;