aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_realtek.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 52ce07534e5b..569d2aa4eeb5 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -2801,7 +2801,8 @@ static int alc_auto_fill_dac_nids(struct hda_codec *codec)
2801 int i; 2801 int i;
2802 2802
2803 again: 2803 again:
2804 spec->multiout.num_dacs = 0; 2804 /* set num_dacs once to full for alc_auto_look_for_dac() */
2805 spec->multiout.num_dacs = cfg->line_outs;
2805 spec->multiout.hp_nid = 0; 2806 spec->multiout.hp_nid = 0;
2806 spec->multiout.extra_out_nid[0] = 0; 2807 spec->multiout.extra_out_nid[0] = 0;
2807 memset(spec->private_dac_nids, 0, sizeof(spec->private_dac_nids)); 2808 memset(spec->private_dac_nids, 0, sizeof(spec->private_dac_nids));
@@ -2834,6 +2835,8 @@ static int alc_auto_fill_dac_nids(struct hda_codec *codec)
2834 } 2835 }
2835 } 2836 }
2836 2837
2838 /* re-count num_dacs and squash invalid entries */
2839 spec->multiout.num_dacs = 0;
2837 for (i = 0; i < cfg->line_outs; i++) { 2840 for (i = 0; i < cfg->line_outs; i++) {
2838 if (spec->private_dac_nids[i]) 2841 if (spec->private_dac_nids[i])
2839 spec->multiout.num_dacs++; 2842 spec->multiout.num_dacs++;