summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2018-05-27 10:13:30 +0900
committerTakashi Iwai <tiwai@suse.de>2018-05-27 08:32:08 +0200
commit84eaaef2ae196ccdac0154a9a9daac95b9b367fd (patch)
tree4538d3e7f35ae00413591ad9b35131aab5d5d004 /sound
parent1ceb506d631f512f8e5b04821c21104b80c15dee (diff)
downloadlinux-stable-84eaaef2ae196ccdac0154a9a9daac95b9b367fd.tar.gz
linux-stable-84eaaef2ae196ccdac0154a9a9daac95b9b367fd.tar.bz2
linux-stable-84eaaef2ae196ccdac0154a9a9daac95b9b367fd.zip
ALSA: dice: unuse second stream for MIDI conformant data channel for TC Electronic models
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/firewire/dice/dice-tcelectronic.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/firewire/dice/dice-tcelectronic.c b/sound/firewire/dice/dice-tcelectronic.c
index a4cbe2da8c15..a8875d24ba2a 100644
--- a/sound/firewire/dice/dice-tcelectronic.c
+++ b/sound/firewire/dice/dice-tcelectronic.c
@@ -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;