diff options
| author | Mark Brown | 2019-04-26 12:02:03 +0200 |
|---|---|---|
| committer | Mark Brown | 2019-04-26 12:02:03 +0200 |
| commit | 93f38ef6a4b62fd57076d36d1345d69f8a328ad9 (patch) | |
| tree | bc7f20d968c8d1f7374927bd187d3f26f786459d /sound/soc/soc-core.c | |
| parent | ASoC: simple-card: Read pin switches conf from devicetree (diff) | |
| parent | ASoC: mediatek: btcvsd fix irq mask (diff) | |
| download | kernel-qcow2-linux-93f38ef6a4b62fd57076d36d1345d69f8a328ad9.tar.gz kernel-qcow2-linux-93f38ef6a4b62fd57076d36d1345d69f8a328ad9.tar.xz kernel-qcow2-linux-93f38ef6a4b62fd57076d36d1345d69f8a328ad9.zip | |
Merge branch 'asoc-5.1' into asoc-5.2
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 75f6a8085a76..2403bec2fccf 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -947,7 +947,7 @@ static void soc_cleanup_component(struct snd_soc_component *component) snd_soc_dapm_free(snd_soc_component_get_dapm(component)); soc_cleanup_component_debugfs(component); component->card = NULL; - if (!component->driver->ignore_module_refcount) + if (!component->driver->module_get_upon_open) module_put(component->dev->driver->owner); } @@ -1381,7 +1381,7 @@ static int soc_probe_component(struct snd_soc_card *card, return 0; } - if (!component->driver->ignore_module_refcount && + if (!component->driver->module_get_upon_open && !try_module_get(component->dev->driver->owner)) return -ENODEV; |