aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/virtuoso.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2008-03-19 03:20:59 -0400
committerTakashi Iwai <tiwai@suse.de>2008-04-24 06:00:28 -0400
commitdb12b8e301455cf18644aa3b765ae10869eb947c (patch)
treea572f2ed562624cb06431b82a3ee4a19725763ad /sound/pci/oxygen/virtuoso.c
parent87eedd2fd409d5cd515ccd6fc454cef15c5fa38b (diff)
[ALSA] oxygen: move MIDI flag to model struct
Put the flag that enables the MIDI port into the model structure instead of passing it as a separate parameter to oxygen_pci_probe(). Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/virtuoso.c')
-rw-r--r--sound/pci/oxygen/virtuoso.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
index 5bf3661ab1fe..fa79db696e2d 100644
--- a/sound/pci/oxygen/virtuoso.c
+++ b/sound/pci/oxygen/virtuoso.c
@@ -353,6 +353,7 @@ static const struct oxygen_model model_xonar = {
353 CAPTURE_0_FROM_I2S_2 | 353 CAPTURE_0_FROM_I2S_2 |
354 CAPTURE_1_FROM_SPDIF, 354 CAPTURE_1_FROM_SPDIF,
355 .dac_channels = 8, 355 .dac_channels = 8,
356 .misc_flags = OXYGEN_MISC_MIDI,
356 .function_flags = OXYGEN_FUNCTION_SPI | 357 .function_flags = OXYGEN_FUNCTION_SPI |
357 OXYGEN_FUNCTION_ENABLE_SPI_4_5, 358 OXYGEN_FUNCTION_ENABLE_SPI_4_5,
358 .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, 359 .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
@@ -371,7 +372,7 @@ static int __devinit xonar_probe(struct pci_dev *pci,
371 ++dev; 372 ++dev;
372 return -ENOENT; 373 return -ENOENT;
373 } 374 }
374 err = oxygen_pci_probe(pci, index[dev], id[dev], 1, &model_xonar); 375 err = oxygen_pci_probe(pci, index[dev], id[dev], &model_xonar);
375 if (err >= 0) 376 if (err >= 0)
376 ++dev; 377 ++dev;
377 return err; 378 return err;