Merge remote branch 'alsa/devel' into topic/misc

1 files changed, 3 insertions, 0 deletions

diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
index 6accaf9580b2..563b6f50821f 100644
--- a/sound/pci/oxygen/virtuoso.c
+++ b/sound/pci/oxygen/virtuoso.c
@@ -49,6 +49,7 @@ static struct pci_device_id xonar_ids[] __devinitdata = {
         { OXYGEN_PCI_SUBID(0x1043, 0x834f) },
         { OXYGEN_PCI_SUBID(0x1043, 0x835c) },
         { OXYGEN_PCI_SUBID(0x1043, 0x835d) },
+        { OXYGEN_PCI_SUBID(0x1043, 0x838e) },
         { OXYGEN_PCI_SUBID_BROKEN_EEPROM },
         { }
 };
@@ -61,6 +62,8 @@ static int __devinit get_xonar_model(struct oxygen *chip,
                 return 0;
         if (get_xonar_cs43xx_model(chip, id) >= 0)
                 return 0;
+        if (get_xonar_wm87x6_model(chip, id) >= 0)
+                return 0;
         return -EINVAL;
 }