]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ALSA: dice: unuse second stream for MIDI conformant data channel for TC Electronic models
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Sun, 27 May 2018 01:13:30 +0000 (10:13 +0900)
committerTakashi Iwai <tiwai@suse.de>
Sun, 27 May 2018 06:32:08 +0000 (08:32 +0200)
At present, all of models produced by TC Electronic except for Konnekt Live
are supported with hard-coded their stream formats. Studio Konnekt 48 is
sore model to support dual streams for both directions. The second stream
has no MIDI conformant data channel in its data block. But current
implementation transfers the second stream with MIDI conformant data
channel.

This commit fixes this issue.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/firewire/dice/dice-tcelectronic.c

index a4cbe2da8c158748bf2e6d123120cd9267494ee5..a8875d24ba2aa00aa1743dbde59c310af8ec310d 100644 (file)
@@ -95,11 +95,9 @@ int snd_dice_detect_tcelectronic_formats(struct snd_dice *dice)
        memcpy(dice->rx_pcm_chs, entry->spec->rx_pcm_chs,
               MAX_STREAMS * SND_DICE_RATE_MODE_COUNT * sizeof(unsigned int));
 
-       for (i = 0; i < MAX_STREAMS; ++i) {
-               if (entry->spec->has_midi) {
-                       dice->tx_midi_ports[i] = 1;
-                       dice->rx_midi_ports[i] = 1;
-               }
+       if (entry->spec->has_midi) {
+               dice->tx_midi_ports[0] = 1;
+               dice->rx_midi_ports[0] = 1;
        }
 
        return 0;