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>
This commit is contained in:
@@ -502,10 +502,15 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
|
||||
if (err < 0)
|
||||
goto err_card;
|
||||
|
||||
if (chip->model.misc_flags & OXYGEN_MISC_MIDI) {
|
||||
if (chip->model.device_config & (MIDI_OUTPUT | MIDI_INPUT)) {
|
||||
unsigned int info_flags = MPU401_INFO_INTEGRATED;
|
||||
if (chip->model.device_config & MIDI_OUTPUT)
|
||||
info_flags |= MPU401_INFO_OUTPUT;
|
||||
if (chip->model.device_config & MIDI_INPUT)
|
||||
info_flags |= MPU401_INFO_INPUT;
|
||||
err = snd_mpu401_uart_new(card, 0, MPU401_HW_CMIPCI,
|
||||
chip->addr + OXYGEN_MPU401,
|
||||
MPU401_INFO_INTEGRATED, 0, 0,
|
||||
info_flags, 0, 0,
|
||||
&chip->midi);
|
||||
if (err < 0)
|
||||
goto err_card;
|
||||
|
Reference in New Issue
Block a user