Merge branch 'fix/hda' into topic/hda

1 files changed, 9 insertions, 7 deletions

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index b592419b2083..5d7b882bd68c 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -4688,9 +4688,9 @@ static int alc880_parse_auto_config(struct hda_codec *codec)
                         spec->multiout.dig_out_nid = dig_nid;
                 else {
                         spec->multiout.slave_dig_outs = spec->slave_dig_outs;
-                        spec->slave_dig_outs[i - 1] = dig_nid;
-                        if (i == ARRAY_SIZE(spec->slave_dig_outs) - 1)
+                        if (i >= ARRAY_SIZE(spec->slave_dig_outs) - 1)
                                 break;
+                        spec->slave_dig_outs[i - 1] = dig_nid;
                 }
         }
         if (spec->autocfg.dig_in_pin)
@@ -6250,7 +6250,7 @@ static struct snd_pci_quirk alc260_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1025, 0x008f, "Acer", ALC260_ACER),
         SND_PCI_QUIRK(0x1509, 0x4540, "Favorit 100XS", ALC260_FAVORIT100),
         SND_PCI_QUIRK(0x103c, 0x2808, "HP d5700", ALC260_HP_3013),
-        SND_PCI_QUIRK(0x103c, 0x280a, "HP d5750", ALC260_HP_3013),
+        SND_PCI_QUIRK(0x103c, 0x280a, "HP d5750", ALC260_AUTO), /* no quirk */
         SND_PCI_QUIRK(0x103c, 0x3010, "HP", ALC260_HP_3013),
         SND_PCI_QUIRK(0x103c, 0x3011, "HP", ALC260_HP_3013),
         SND_PCI_QUIRK(0x103c, 0x3012, "HP", ALC260_HP_DC7600),
@@ -8912,10 +8912,11 @@ static struct snd_pci_quirk alc882_ssid_cfg_tbl[] = {
         SND_PCI_QUIRK(0x106b, 0x3800, "MacbookPro 4,1", ALC885_MBP3),
         SND_PCI_QUIRK(0x106b, 0x3e00, "iMac 24 Aluminum", ALC885_IMAC24),
         SND_PCI_QUIRK(0x106b, 0x3f00, "Macbook 5,1", ALC885_MB5),
-        /* FIXME: HP jack sense seems not working for MBP 5,1, so apparently
-         * no perfect solution yet
+        /* FIXME: HP jack sense seems not working for MBP 5,1 or 5,2,
+         * so apparently no perfect solution yet
          */
         SND_PCI_QUIRK(0x106b, 0x4000, "MacbookPro 5,1", ALC885_MB5),
+        SND_PCI_QUIRK(0x106b, 0x4600, "MacbookPro 5,2", ALC885_MB5),
         {} /* terminator */
 };
 
@@ -9814,9 +9815,9 @@ static int alc882_parse_auto_config(struct hda_codec *codec)
                         spec->multiout.dig_out_nid = dig_nid;
                 else {
                         spec->multiout.slave_dig_outs = spec->slave_dig_outs;
-                        spec->slave_dig_outs[i - 1] = dig_nid;
-                        if (i == ARRAY_SIZE(spec->slave_dig_outs) - 1)
+                        if (i >= ARRAY_SIZE(spec->slave_dig_outs) - 1)
                                 break;
+                        spec->slave_dig_outs[i - 1] = dig_nid;
                 }
         }
         if (spec->autocfg.dig_in_pin)
@@ -11457,6 +11458,7 @@ static struct snd_pci_quirk alc262_cfg_tbl[] = {
         SND_PCI_QUIRK(0x104d, 0x820f, "Sony ASSAMD", ALC262_SONY_ASSAMD),
         SND_PCI_QUIRK(0x104d, 0x9016, "Sony VAIO", ALC262_AUTO), /* dig-only */
         SND_PCI_QUIRK(0x104d, 0x9025, "Sony VAIO Z21MN", ALC262_TOSHIBA_S06),
+        SND_PCI_QUIRK(0x104d, 0x9035, "Sony VAIO VGN-FW170J", ALC262_AUTO),
         SND_PCI_QUIRK_MASK(0x104d, 0xff00, 0x9000, "Sony VAIO",
                            ALC262_SONY_ASSAMD),
         SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba dynabook SS RX1",