aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/xonar_wm87x6.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/oxygen/xonar_wm87x6.c')
-rw-r--r--sound/pci/oxygen/xonar_wm87x6.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/sound/pci/oxygen/xonar_wm87x6.c b/sound/pci/oxygen/xonar_wm87x6.c
index 63cff90706bf..6ce68604c25e 100644
--- a/sound/pci/oxygen/xonar_wm87x6.c
+++ b/sound/pci/oxygen/xonar_wm87x6.c
@@ -1255,7 +1255,6 @@ static void dump_wm87x6_registers(struct oxygen *chip,
1255} 1255}
1256 1256
1257static const struct oxygen_model model_xonar_ds = { 1257static const struct oxygen_model model_xonar_ds = {
1258 .shortname = "Xonar DS",
1259 .longname = "Asus Virtuoso 66", 1258 .longname = "Asus Virtuoso 66",
1260 .chip = "AV200", 1259 .chip = "AV200",
1261 .init = xonar_ds_init, 1260 .init = xonar_ds_init,
@@ -1321,12 +1320,17 @@ static const struct oxygen_model model_xonar_hdav_slim = {
1321 .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, 1320 .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
1322}; 1321};
1323 1322
1324int __devinit get_xonar_wm87x6_model(struct oxygen *chip, 1323int get_xonar_wm87x6_model(struct oxygen *chip,
1325 const struct pci_device_id *id) 1324 const struct pci_device_id *id)
1326{ 1325{
1327 switch (id->subdevice) { 1326 switch (id->subdevice) {
1328 case 0x838e: 1327 case 0x838e:
1329 chip->model = model_xonar_ds; 1328 chip->model = model_xonar_ds;
1329 chip->model.shortname = "Xonar DS";
1330 break;
1331 case 0x8522:
1332 chip->model = model_xonar_ds;
1333 chip->model.shortname = "Xonar DSX";
1330 break; 1334 break;
1331 case 0x835e: 1335 case 0x835e:
1332 chip->model = model_xonar_hdav_slim; 1336 chip->model = model_xonar_hdav_slim;