summaryrefslogtreecommitdiff
path: root/sound/firewire/dice/dice.c
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2014-12-08 18:10:39 +0300
committerTakashi Iwai <tiwai@suse.de>2014-12-10 12:46:14 +0300
commita113ff886b9a6e892dd4107be1fd7883cf020885 (patch)
treea912449442c246b35652f16758dc9d1029626525 /sound/firewire/dice/dice.c
parent69dcf3e47a39f8f42e35245289691ca8321b46f1 (diff)
downloadlinux-a113ff886b9a6e892dd4107be1fd7883cf020885.tar.xz
ALSA: dice: Add support for MIDI capture/playback
This commit adds a support for MIDI capture/playback When MIDI substrams already start streaming and PCM substreams are going to join at different sampling rate, streams are stopped once. Then sampling rate is changed and streams are restarted. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Acked-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/dice/dice.c')
-rw-r--r--sound/firewire/dice/dice.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/firewire/dice/dice.c b/sound/firewire/dice/dice.c
index 85bcfaf3ea8a..90d8f40ff727 100644
--- a/sound/firewire/dice/dice.c
+++ b/sound/firewire/dice/dice.c
@@ -279,6 +279,10 @@ static int dice_probe(struct fw_unit *unit, const struct ieee1394_device_id *id)
snd_dice_create_proc(dice);
+ err = snd_dice_create_midi(dice);
+ if (err < 0)
+ goto error;
+
err = snd_dice_stream_init_duplex(dice);
if (err < 0)
goto error;