1 files changed, 29 insertions, 7 deletions

diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 72a2f60b087c..019e1a00414a 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -1809,11 +1809,11 @@ static int via_auto_fill_dac_nids(struct hda_codec *codec)
 {
         struct via_spec *spec = codec->spec;
         const struct auto_pin_cfg *cfg = &spec->autocfg;
-        int i, dac_num;
+        int i;
         hda_nid_t nid;
 
+        spec->multiout.num_dacs = 0;
         spec->multiout.dac_nids = spec->private_dac_nids;
-        dac_num = 0;
         for (i = 0; i < cfg->line_outs; i++) {
                 hda_nid_t dac = 0;
                 nid = cfg->line_out_pins[i];
@@ -1824,16 +1824,13 @@ static int via_auto_fill_dac_nids(struct hda_codec *codec)
                 if (!i && parse_output_path(codec, nid, dac, 1,
                                             &spec->out_mix_path))
                         dac = spec->out_mix_path.path[0];
-                if (dac) {
-                        spec->private_dac_nids[i] = dac;
-                        dac_num++;
-                }
+                if (dac)
+                        spec->private_dac_nids[spec->multiout.num_dacs++] = dac;
         }
         if (!spec->out_path[0].depth && spec->out_mix_path.depth) {
                 spec->out_path[0] = spec->out_mix_path;
                 spec->out_mix_path.depth = 0;
         }
-        spec->multiout.num_dacs = dac_num;
         return 0;
 }
 
@@ -3628,6 +3625,7 @@ static void set_widgets_power_state_vt2002P(struct hda_codec *codec)
  */
 enum {
         VIA_FIXUP_INTMIC_BOOST,
+        VIA_FIXUP_ASUS_G75,
 };
 
 static void via_fixup_intmic_boost(struct hda_codec *codec,
@@ -3642,13 +3640,35 @@ static const struct hda_fixup via_fixups[] = {
                 .type = HDA_FIXUP_FUNC,
                 .v.func = via_fixup_intmic_boost,
         },
+        [VIA_FIXUP_ASUS_G75] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        /* set 0x24 and 0x33 as speakers */
+                        { 0x24, 0x991301f0 },
+                        { 0x33, 0x991301f1 }, /* subwoofer */
+                        { }
+                }
+        },
 };
 
 static const struct snd_pci_quirk vt2002p_fixups[] = {
+        SND_PCI_QUIRK(0x1043, 0x1487, "Asus G75", VIA_FIXUP_ASUS_G75),
         SND_PCI_QUIRK(0x1043, 0x8532, "Asus X202E", VIA_FIXUP_INTMIC_BOOST),
         {}
 };
 
+/* NIDs 0x24 and 0x33 on VT1802 have connections to non-existing NID 0x3e
+ * Replace this with mixer NID 0x1c
+ */
+static void fix_vt1802_connections(struct hda_codec *codec)
+{
+        static hda_nid_t conn_24[] = { 0x14, 0x1c };
+        static hda_nid_t conn_33[] = { 0x1c };
+
+        snd_hda_override_conn_list(codec, 0x24, ARRAY_SIZE(conn_24), conn_24);
+        snd_hda_override_conn_list(codec, 0x33, ARRAY_SIZE(conn_33), conn_33);
+}
+
 /* patch for vt2002P */
 static int patch_vt2002P(struct hda_codec *codec)
 {
@@ -3663,6 +3683,8 @@ static int patch_vt2002P(struct hda_codec *codec)
         spec->aa_mix_nid = 0x21;
         override_mic_boost(codec, 0x2b, 0, 3, 40);
         override_mic_boost(codec, 0x29, 0, 3, 40);
+        if (spec->codec_type == VT1802)
+                fix_vt1802_connections(codec);
         add_secret_dac_path(codec);
 
         snd_hda_pick_fixup(codec, NULL, vt2002p_fixups, via_fixups);