]> git.itanic.dy.fi Git - linux-stable/commitdiff
ASoC: soc-pcm.c: call __soc_pcm_close() in soc_pcm_close()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 22 Aug 2022 02:35:32 +0000 (02:35 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 May 2023 09:50:27 +0000 (11:50 +0200)
commit 6bbabd28805f36baf6d0f3eb082db032a638f612 upstream.

commit b7898396f4bbe16 ("ASoC: soc-pcm: Fix and cleanup DPCM locking")
added __soc_pcm_close() for non-lock version of soc_pcm_close().
But soc_pcm_close() is not using it. It is no problem, but confusable.

static int __soc_pcm_close(...)
{
=> return soc_pcm_clean(rtd, substream, 0);
}

static int soc_pcm_close(...)
{
...
snd_soc_dpcm_mutex_lock(rtd);
=> soc_pcm_clean(rtd, substream, 0);
snd_soc_dpcm_mutex_unlock(rtd);
return 0;
}

This patch use it.

Fixes: b7898396f4bbe16 ("ASoC: soc-pcm: Fix and cleanup DPCM locking")
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87czctgg3w.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/soc-pcm.c

index 5e02b9f84864d02faee1b8be2f500e1d9699f39b..76c807372ef50151bc37322793b0f9996d159d1a 100644 (file)
@@ -723,7 +723,7 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
        struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
 
        snd_soc_dpcm_mutex_lock(rtd);
-       soc_pcm_clean(rtd, substream, 0);
+       __soc_pcm_close(rtd, substream);
        snd_soc_dpcm_mutex_unlock(rtd);
        return 0;
 }