From fd0e4d5b5cdd5410bcfc657e60ffef3834c53beb Mon Sep 17 00:00:00 2001
From: Sergiu Giurgiu <sgiurgiu11@gmail.com>
Date: Sun, 9 Sep 2012 05:14:15 -0400
Subject: [PATCH] --- yaml --- r: 342576 b: refs/heads/master c:
 4492363251235c4499a2d073c5f09121ea23d39d h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/sound/pci/oxygen/virtuoso.c     | 1 +
 trunk/sound/pci/oxygen/xonar_wm87x6.c | 6 +++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 72e1d25e37ac..1b451c515e51 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bef1c377d1bd8fd879ee5a66cf6f45ba16820cd
+refs/heads/master: 4492363251235c4499a2d073c5f09121ea23d39d
diff --git a/trunk/sound/pci/oxygen/virtuoso.c b/trunk/sound/pci/oxygen/virtuoso.c
index 3d71423b23bc..8104eab90e51 100644
--- a/trunk/sound/pci/oxygen/virtuoso.c
+++ b/trunk/sound/pci/oxygen/virtuoso.c
@@ -52,6 +52,7 @@ static DEFINE_PCI_DEVICE_TABLE(xonar_ids) = {
 	{ OXYGEN_PCI_SUBID(0x1043, 0x835d) },
 	{ OXYGEN_PCI_SUBID(0x1043, 0x835e) },
 	{ OXYGEN_PCI_SUBID(0x1043, 0x838e) },
+	{ OXYGEN_PCI_SUBID(0x1043, 0x8522) },
 	{ OXYGEN_PCI_SUBID_BROKEN_EEPROM },
 	{ }
 };
diff --git a/trunk/sound/pci/oxygen/xonar_wm87x6.c b/trunk/sound/pci/oxygen/xonar_wm87x6.c
index 63cff90706bf..b555b620babb 100644
--- a/trunk/sound/pci/oxygen/xonar_wm87x6.c
+++ b/trunk/sound/pci/oxygen/xonar_wm87x6.c
@@ -1255,7 +1255,6 @@ static void dump_wm87x6_registers(struct oxygen *chip,
 }
 
 static const struct oxygen_model model_xonar_ds = {
-	.shortname = "Xonar DS",
 	.longname = "Asus Virtuoso 66",
 	.chip = "AV200",
 	.init = xonar_ds_init,
@@ -1327,6 +1326,11 @@ int __devinit get_xonar_wm87x6_model(struct oxygen *chip,
 	switch (id->subdevice) {
 	case 0x838e:
 		chip->model = model_xonar_ds;
+		chip->model.shortname = "Xonar DS";
+		break;
+	case 0x8522:
+		chip->model = model_xonar_ds;
+		chip->model.shortname = "Xonar DSX";
 		break;
 	case 0x835e:
 		chip->model = model_xonar_hdav_slim;