p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ASoC: pcm: fix error handling when try_module_get() fails. 

Handle error before returning when try_module_get() fails
to prevent inconsistent mutex lock/unlock.

Fixes: 52034add7 (ASoC: pcm: update module refcount if
		  module_get_upon_open is set)
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Ranjani Sridharan 2019-04-08 12:30:25 -07:00 committed by Mark Brown
parent e37c2deafe
commit 70802487bb
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/soc-pcm.c
View File

@ -518,8 +518,10 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
continue; continue;
if (component->driver->module_get_upon_open && if (component->driver->module_get_upon_open &&
!try_module_get(component->dev->driver->owner)) !try_module_get(component->dev->driver->owner)) {
return -ENODEV; ret = -ENODEV;
goto module_err;
}
ret = component->driver->ops->open(substream); ret = component->driver->ops->open(substream);
if (ret < 0) { if (ret < 0) {
@ -636,7 +638,7 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
component_err: component_err:
soc_pcm_components_close(substream, component); soc_pcm_components_close(substream, component);
module_err:
if (cpu_dai->driver->ops->shutdown) if (cpu_dai->driver->ops->shutdown)
cpu_dai->driver->ops->shutdown(substream, cpu_dai); cpu_dai->driver->ops->shutdown(substream, cpu_dai);
out: out: