diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-05-20 04:42:39 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-21 23:59:17 +0300 |
| commit | 428306c3b3fe107b1d059ceecf6fda09a1fcedf5 (patch) | |
| tree | 71fb2d8359f1ad1b5680139a1b9733800f576463 | |
| parent | b385256eb54f0193f0f595a675409ba6e7282ffe (diff) | |
| download | linux-428306c3b3fe107b1d059ceecf6fda09a1fcedf5.tar.xz | |
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>
| -rw-r--r-- | sound/soc/soc-pcm.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 74c7d38af2c6..4a7096a22b28 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -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); |