Skip to content

Commit

Permalink
ASoC: soc-pcm: ignore un-needed mutex_unlock() case on soc_pcm_open()
Browse files Browse the repository at this point in the history
commit 140a453 ("ASoC: soc-pcm: add soc_pcm_clean() and call it
from soc_pcm_open/close()") switch to call soc_pcm_clean() on
soc_pcm_open() when rollback case.

But, it uses "goto err" (A) *before* mutex_lock() (B) when error of
snd_soc_pcm_component_pm_runtime_get().
The mutex_unlock() (C) is not needed in such case. This patch fix it.

	static int soc_pcm_open(...)
	{
		...
		ret = snd_soc_pcm_component_pm_runtime_get(rtd, substream);
		if (ret < 0)
(A)			goto err;

(B)		mutex_lock_nested(...);
		...
	err:
(C)		mutex_unlock(..);
		...
	}

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87k0waag44.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Oct 1, 2020
1 parent 27f41df commit cb2fce9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sound/soc/soc-pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)

ret = snd_soc_pcm_component_pm_runtime_get(rtd, substream);
if (ret < 0)
goto err;
goto pm_err;

mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);

Expand Down Expand Up @@ -786,7 +786,7 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
snd_soc_runtime_activate(rtd, substream->stream);
err:
mutex_unlock(&rtd->card->pcm_mutex);

pm_err:
if (ret < 0)
soc_pcm_clean(substream, 1);

Expand Down

0 comments on commit cb2fce9

Please sign in to comment.