aboutsummaryrefslogtreecommitdiffstats
path: root/sound/firewire/dice/dice-stream.c
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2014-12-09 00:10:39 +0900
committerTakashi Iwai <tiwai@suse.de>2014-12-10 10:46:14 +0100
commita113ff886b9a6e892dd4107be1fd7883cf020885 (patch)
treea912449442c246b35652f16758dc9d1029626525 /sound/firewire/dice/dice-stream.c
parentALSA: dice: Add support for capturing PCM samples (diff)
downloadlinux-dev-a113ff886b9a6e892dd4107be1fd7883cf020885.tar.xz
linux-dev-a113ff886b9a6e892dd4107be1fd7883cf020885.zip
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-stream.c')
-rw-r--r--sound/firewire/dice/dice-stream.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/firewire/dice/dice-stream.c b/sound/firewire/dice/dice-stream.c
index 20765a05d294..fa9cf761b610 100644
--- a/sound/firewire/dice/dice-stream.c
+++ b/sound/firewire/dice/dice-stream.c
@@ -218,6 +218,8 @@ int snd_dice_stream_start_duplex(struct snd_dice *dice, unsigned int rate)
"fail to get sampling rate\n");
goto end;
}
+ if (rate == 0)
+ rate = curr_rate;
if (rate != curr_rate)
stop_stream(dice, master);