xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'asoc-5.1' into asoc-5.2

Browse Source
This commit is contained in:
Mark Brown
2019-04-26 11:02:03 +01:00
parent 552f2d7edd 780f202f2b
commit 93f38ef6a4
14 changed files with 74 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/soc-core.c
View File

@@ -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;