diff options
| author |   Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2019-06-15 18:10:58 +0900 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2019-06-17 08:18:35 +0200 |
| commit | 5e818ac21f9d48a52955e68b96148a3b18f60c09 (patch) | |
| tree | 169e99629e4977bcd7e17aaa4bfddf4596dd17f6 /sound/firewire | |
| parent | ALSA: bebob: code refactoring for callback function to rawmidi interface (diff) | |
| download | linux-dev-5e818ac21f9d48a52955e68b96148a3b18f60c09.tar.xz linux-dev-5e818ac21f9d48a52955e68b96148a3b18f60c09.zip | |
ALSA: bebob: change the range of critical section for stream data in PCM.hw_free callback
The operation of duplex streams should be in critical section.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
| -rw-r--r-- | sound/firewire/bebob/bebob_pcm.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/firewire/bebob/bebob_pcm.c b/sound/firewire/bebob/bebob_pcm.c index 530db7a7844c..e21de44deaa9 100644 --- a/sound/firewire/bebob/bebob_pcm.c +++ b/sound/firewire/bebob/bebob_pcm.c @@ -213,14 +213,15 @@ static int pcm_hw_free(struct snd_pcm_substream *substream) { struct snd_bebob *bebob = substream->private_data; - if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN) { - mutex_lock(&bebob->mutex); + mutex_lock(&bebob->mutex); + + if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN) bebob->substreams_counter--; - mutex_unlock(&bebob->mutex); - } snd_bebob_stream_stop_duplex(bebob); + mutex_unlock(&bebob->mutex); + return snd_pcm_lib_free_vmalloc_buffer(substream); } |