summaryrefslogtreecommitdiff
path: root/sound/core/pcm_native.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-03-11 21:45:26 +0300
committerMark Brown <broonie@kernel.org>2020-03-11 21:45:26 +0300
commit4d90a4e677c5c45c787a774c84442e75c7ddd5be (patch)
tree50312d13362dd49615148661ae7e6d91ac349719 /sound/core/pcm_native.c
parent9032cdd96a2d4b0ef2f43499328f8a68050be2ec (diff)
parent2c523b344dfa65a3738e7039832044aa133c75fb (diff)
downloadlinux-4d90a4e677c5c45c787a774c84442e75c7ddd5be.tar.xz
Merge tag 'v5.6-rc5' into asoc-5.7
Linux 5.6-rc5
Diffstat (limited to 'sound/core/pcm_native.c')
-rw-r--r--sound/core/pcm_native.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 336406bcb59e..d5443eeb8b63 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -2594,7 +2594,8 @@ void snd_pcm_release_substream(struct snd_pcm_substream *substream)
snd_pcm_drop(substream);
if (substream->hw_opened) {
- do_hw_free(substream);
+ if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN)
+ do_hw_free(substream);
substream->ops->close(substream);
substream->hw_opened = 0;
}