diff options
| -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); |