aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/virtuoso.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2008-09-22 09:03:42 +0200
committerClemens Ladisch <clemens@ladisch.de>2008-09-22 09:03:42 +0200
commitdbbbd6744439d95d2b0dc23c5cdca2c477377f76 (patch)
tree6a149c7dbc7d0889cf8c348be2618210661bea84 /sound/pci/oxygen/virtuoso.c
parentd76596b1ee7f5cdbd0b73d374ba72372a2c8b725 (diff)
downloadmrst-s0i3-test-dbbbd6744439d95d2b0dc23c5cdca2c477377f76.tar.gz
mrst-s0i3-test-dbbbd6744439d95d2b0dc23c5cdca2c477377f76.tar.xz
mrst-s0i3-test-dbbbd6744439d95d2b0dc23c5cdca2c477377f76.zip
ALSA: oxygen: configure MIDI via device_config
To enable the MIDI port, model drivers must now set flags in device_config, not only in misc_flags. This allows model drivers to enable the UART without creating an ALSA MIDI device. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound/pci/oxygen/virtuoso.c')
-rw-r--r--sound/pci/oxygen/virtuoso.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
index f416e68338e..befada742ae 100644
--- a/sound/pci/oxygen/virtuoso.c
+++ b/sound/pci/oxygen/virtuoso.c
@@ -569,7 +569,9 @@ static const struct oxygen_model model_xonar_d2 = {
.device_config = PLAYBACK_0_TO_I2S |
PLAYBACK_1_TO_SPDIF |
CAPTURE_0_FROM_I2S_2 |
- CAPTURE_1_FROM_SPDIF,
+ CAPTURE_1_FROM_SPDIF |
+ MIDI_OUTPUT |
+ MIDI_INPUT,
.dac_channels = 8,
.dac_volume_min = 0x0f,
.dac_volume_max = 0xff,