UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: soc-pcm: fixup try_module_get()/module_put() timing 

soc_pcm_components_open/close() try to call
try_module_get()/module_put() based on
component->driver->module_get_upon_open.

Here, the purpose why we need to call these functions are to
checking module reference.
Thus, we need to call try_module_open() even though it doesn't
have .open callback.

The same reason, we need to call module_put() even though it
doesn't have .close

This patch calls try_module_get()/module_put() regardless of
.open/.close

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-05-20 10:42:39 +09:00 committed by Mark Brown
parent b385256eb5
commit 428306c3b3
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -458,10 +458,6 @@ static int soc_pcm_components_open(struct snd_pcm_substream *substream,
component = rtdcom->component;
*last = component;
if (!component->driver->ops ||
!component->driver->ops->open)
continue;
if (component->driver->module_get_upon_open &&
!try_module_get(component->dev->driver->owner)) {
dev_err(component->dev,
@ -470,6 +466,10 @@ static int soc_pcm_components_open(struct snd_pcm_substream *substream,
return -ENODEV;
}
if (!component->driver->ops ||
!component->driver->ops->open)
continue;
ret = component->driver->ops->open(substream);
if (ret < 0) {
dev_err(component->dev,
@ -495,11 +495,9 @@ static int soc_pcm_components_close(struct snd_pcm_substream *substream,
if (component == last)
break;
if (!component->driver->ops ||
!component->driver->ops->close)
continue;
component->driver->ops->close(substream);
if (component->driver->ops &&
component->driver->ops->close)
component->driver->ops->close(substream);
if (component->driver->module_get_upon_open)
module_put(component->dev->driver->owner);