diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2015-10-18 17:09:39 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-10-19 12:01:07 +0200 |
| commit | bb71da43469679bf53dc97433dc02895e4d58352 (patch) | |
| tree | e511689f2c3cbc7ff8bb470d70c4a8fc4fd6177b /sound/firewire/oxfw | |
| parent | 32056041019aa91c2555cc4c280f9fbca8a1be99 (diff) | |
| download | linux-stable-bb71da43469679bf53dc97433dc02895e4d58352.tar.gz linux-stable-bb71da43469679bf53dc97433dc02895e4d58352.tar.bz2 linux-stable-bb71da43469679bf53dc97433dc02895e4d58352.zip | |
ALSA: oxfw: support more MIDI ports
In IEC 61883-6, sequence multiplexing is applied to MIDI conformant data
channel. As a result, eight MIDI data streams are included in the channel.
Although ALSA AM824 data block processing layer implements this
multiplexing, current OXFW driver doesn't utilize it due to wrong
calculation of MIDI ports.
This commit fixes this bug to add proper calculation. Although this commit
allows to use 8 MIDI data streams, the number of available MIDI ports is
limited by the number of ALSA MIDI ports added by the driver.
Fixes: df075feefbd3('ALSA: firewire-lib: complete AM824 data block processing layer')
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/oxfw')
| -rw-r--r-- | sound/firewire/oxfw/oxfw-stream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/firewire/oxfw/oxfw-stream.c b/sound/firewire/oxfw/oxfw-stream.c index 48798084de16..7cb5743c073b 100644 --- a/sound/firewire/oxfw/oxfw-stream.c +++ b/sound/firewire/oxfw/oxfw-stream.c @@ -148,7 +148,7 @@ static int start_stream(struct snd_oxfw *oxfw, struct amdtp_stream *stream, } pcm_channels = formation.pcm; - midi_ports = DIV_ROUND_UP(formation.midi, 8); + midi_ports = formation.midi * 8; /* The stream should have one pcm channels at least */ if (pcm_channels == 0) { |