Commit 428306c3 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b385256e
...@@ -458,10 +458,6 @@ static int soc_pcm_components_open(struct snd_pcm_substream *substream, ...@@ -458,10 +458,6 @@ static int soc_pcm_components_open(struct snd_pcm_substream *substream,
component = rtdcom->component; component = rtdcom->component;
*last = component; *last = component;
if (!component->driver->ops ||
!component->driver->ops->open)
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)) {
dev_err(component->dev, dev_err(component->dev,
...@@ -470,6 +466,10 @@ static int soc_pcm_components_open(struct snd_pcm_substream *substream, ...@@ -470,6 +466,10 @@ static int soc_pcm_components_open(struct snd_pcm_substream *substream,
return -ENODEV; return -ENODEV;
} }
if (!component->driver->ops ||
!component->driver->ops->open)
continue;
ret = component->driver->ops->open(substream); ret = component->driver->ops->open(substream);
if (ret < 0) { if (ret < 0) {
dev_err(component->dev, dev_err(component->dev,
...@@ -495,11 +495,9 @@ static int soc_pcm_components_close(struct snd_pcm_substream *substream, ...@@ -495,11 +495,9 @@ static int soc_pcm_components_close(struct snd_pcm_substream *substream,
if (component == last) if (component == last)
break; break;
if (!component->driver->ops || if (component->driver->ops &&
!component->driver->ops->close) component->driver->ops->close)
continue; component->driver->ops->close(substream);
component->driver->ops->close(substream);
if (component->driver->module_get_upon_open) if (component->driver->module_get_upon_open)
module_put(component->dev->driver->owner); module_put(component->dev->driver->owner);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment