Unverified Commit 6bbabd28 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-pcm.c: call __soc_pcm_close() in soc_pcm_close() 



commit b7898396 ("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: b7898396 ("ASoC: soc-pcm: Fix and cleanup DPCM locking")
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87czctgg3w.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent cd3b9a0f

sound/soc/soc-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}