From c6b84ffbd5e78d6cf4aaafe5502e1bc99eb9657c Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Sat, 15 Jun 2019 18:11:00 +0900 Subject: [PATCH] ALSA: fireworks: 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 Signed-off-by: Takashi Iwai --- sound/firewire/fireworks/fireworks_pcm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/firewire/fireworks/fireworks_pcm.c b/sound/firewire/fireworks/fireworks_pcm.c index 287fc05d5917..8dc34249a1b0 100644 --- a/sound/firewire/fireworks/fireworks_pcm.c +++ b/sound/firewire/fireworks/fireworks_pcm.c @@ -247,14 +247,15 @@ static int pcm_hw_free(struct snd_pcm_substream *substream) { struct snd_efw *efw = substream->private_data; - if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN) { - mutex_lock(&efw->mutex); + mutex_lock(&efw->mutex); + + if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN) --efw->substreams_counter; - mutex_unlock(&efw->mutex); - } snd_efw_stream_stop_duplex(efw); + mutex_unlock(&efw->mutex); + return snd_pcm_lib_free_vmalloc_buffer(substream); }