diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2019-06-12 17:44:21 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-06-12 15:27:00 +0200 |
| commit | 4f380d0070528da8b93c4ac3994c20097393f6dd (patch) | |
| tree | 052da4ad1df8177fd087169c89dfb0076cd6e0f8 /sound/firewire/oxfw/oxfw-midi.c | |
| parent | 4a0a04729a44ea317270885e1722636b156cf620 (diff) | |
| download | linux-4f380d0070528da8b93c4ac3994c20097393f6dd.tar.gz | |
ALSA: oxfw: configure packet format in pcm.hw_params callback
This commit is a part of preparation to perform allocation/release of isochronous resources in pcm.hw_params/hw_free callbacks. At present, several operations are done in pcm.prepare callback. To reduce load of the callback, This commit splits out an operation to set packet format in pcm.hw_params callback. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/oxfw/oxfw-midi.c')
| -rw-r--r-- | sound/firewire/oxfw/oxfw-midi.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sound/firewire/oxfw/oxfw-midi.c b/sound/firewire/oxfw/oxfw-midi.c index 092493497f1a..9ba62778add2 100644 --- a/sound/firewire/oxfw/oxfw-midi.c +++ b/sound/firewire/oxfw/oxfw-midi.c @@ -19,8 +19,11 @@ static int midi_capture_open(struct snd_rawmidi_substream *substream) mutex_lock(&oxfw->mutex); - ++oxfw->substreams_count; - err = snd_oxfw_stream_start_duplex(oxfw, &oxfw->tx_stream, 0, 0); + err = snd_oxfw_stream_reserve_duplex(oxfw, &oxfw->tx_stream, 0, 0); + if (err >= 0) { + ++oxfw->substreams_count; + err = snd_oxfw_stream_start_duplex(oxfw); + } mutex_unlock(&oxfw->mutex); @@ -41,8 +44,11 @@ static int midi_playback_open(struct snd_rawmidi_substream *substream) mutex_lock(&oxfw->mutex); - ++oxfw->substreams_count; - err = snd_oxfw_stream_start_duplex(oxfw, &oxfw->rx_stream, 0, 0); + err = snd_oxfw_stream_reserve_duplex(oxfw, &oxfw->rx_stream, 0, 0); + if (err >= 0) { + ++oxfw->substreams_count; + err = snd_oxfw_stream_start_duplex(oxfw); + } mutex_unlock(&oxfw->mutex); |