diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2008-03-19 07:20:59 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 10:00:28 (GMT) |
commit | db12b8e301455cf18644aa3b765ae10869eb947c (patch) | |
tree | a572f2ed562624cb06431b82a3ee4a19725763ad /sound/pci/oxygen/virtuoso.c | |
parent | 87eedd2fd409d5cd515ccd6fc454cef15c5fa38b (diff) | |
download | linux-db12b8e301455cf18644aa3b765ae10869eb947c.tar.xz |
[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.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c index 5bf3661..fa79db6 100644 --- a/sound/pci/oxygen/virtuoso.c +++ b/sound/pci/oxygen/virtuoso.c @@ -353,6 +353,7 @@ static const struct oxygen_model model_xonar = { CAPTURE_0_FROM_I2S_2 | CAPTURE_1_FROM_SPDIF, .dac_channels = 8, + .misc_flags = OXYGEN_MISC_MIDI, .function_flags = OXYGEN_FUNCTION_SPI | OXYGEN_FUNCTION_ENABLE_SPI_4_5, .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, @@ -371,7 +372,7 @@ static int __devinit xonar_probe(struct pci_dev *pci, ++dev; return -ENOENT; } - err = oxygen_pci_probe(pci, index[dev], id[dev], 1, &model_xonar); + err = oxygen_pci_probe(pci, index[dev], id[dev], &model_xonar); if (err >= 0) ++dev; return err; |