diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2019-06-18 16:26:15 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-06-21 12:46:58 +0300 |
| commit | 9628fc82f9feedfcb6b9756efb2966c00b3811ef (patch) | |
| tree | e117cc6cd001846c885638a23fcee5aad0376204 /sound | |
| parent | 15d472ecc510e20e42337c8205fa3987329e488d (diff) | |
| download | linux-9628fc82f9feedfcb6b9756efb2966c00b3811ef.tar.xz | |
ALSA: firewire-tascam: unify stop and release method for duplex streams
>From callbacks for pcm and rawmidi interfaces, the functions to stop
and release duplex streams are called at the same time. This commit
merges the two functions.
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/tascam/tascam-pcm.c | 1 | ||||
| -rw-r--r-- | sound/firewire/tascam/tascam-stream.c | 14 | ||||
| -rw-r--r-- | sound/firewire/tascam/tascam.h | 1 |
3 files changed, 5 insertions, 11 deletions
diff --git a/sound/firewire/tascam/tascam-pcm.c b/sound/firewire/tascam/tascam-pcm.c index 450711bef508..300683a82c68 100644 --- a/sound/firewire/tascam/tascam-pcm.c +++ b/sound/firewire/tascam/tascam-pcm.c @@ -118,7 +118,6 @@ static int pcm_hw_free(struct snd_pcm_substream *substream) --tscm->substreams_counter; snd_tscm_stream_stop_duplex(tscm); - snd_tscm_stream_release_duplex(tscm); mutex_unlock(&tscm->mutex); diff --git a/sound/firewire/tascam/tascam-stream.c b/sound/firewire/tascam/tascam-stream.c index f572dfc15114..0e515b7be276 100644 --- a/sound/firewire/tascam/tascam-stream.c +++ b/sound/firewire/tascam/tascam-stream.c @@ -380,14 +380,6 @@ int snd_tscm_stream_reserve_duplex(struct snd_tscm *tscm, unsigned int rate) return 0; } -void snd_tscm_stream_release_duplex(struct snd_tscm *tscm) -{ - if (tscm->substreams_counter == 0) { - fw_iso_resources_free(&tscm->tx_resources); - fw_iso_resources_free(&tscm->rx_resources); - } -} - int snd_tscm_stream_start_duplex(struct snd_tscm *tscm, unsigned int rate) { unsigned int generation = tscm->rx_resources.generation; @@ -455,8 +447,12 @@ error: void snd_tscm_stream_stop_duplex(struct snd_tscm *tscm) { - if (tscm->substreams_counter == 0) + if (tscm->substreams_counter == 0) { finish_session(tscm); + + fw_iso_resources_free(&tscm->tx_resources); + fw_iso_resources_free(&tscm->rx_resources); + } } void snd_tscm_stream_lock_changed(struct snd_tscm *tscm) diff --git a/sound/firewire/tascam/tascam.h b/sound/firewire/tascam/tascam.h index 1cb75c374f11..4ed88cceaedb 100644 --- a/sound/firewire/tascam/tascam.h +++ b/sound/firewire/tascam/tascam.h @@ -148,7 +148,6 @@ int snd_tscm_stream_init_duplex(struct snd_tscm *tscm); void snd_tscm_stream_update_duplex(struct snd_tscm *tscm); void snd_tscm_stream_destroy_duplex(struct snd_tscm *tscm); int snd_tscm_stream_reserve_duplex(struct snd_tscm *tscm, unsigned int rate); -void snd_tscm_stream_release_duplex(struct snd_tscm *tscm); int snd_tscm_stream_start_duplex(struct snd_tscm *tscm, unsigned int rate); void snd_tscm_stream_stop_duplex(struct snd_tscm *tscm); |