lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: core - fix module reference counting for CPU DAIs

Browse Source 
Currently CODEC and platform drivers have their module reference count
incremented soc_probe_dai_link() whilst CPU DAI drivers have their reference
count incremented in soc_bind_dai_link().

CPU DAIs should have their reference count incremented in soc_probe_dai_link()
just like the CODEC and platform drivers.

Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Liam Girdwood
2011-05-24 13:57:43 +01:00
committed by Mark Brown
parent 477a66948e
commit 61b61e3c5c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1306,10 +1306,6 @@ static int soc_bind_dai_link(struct snd_soc_card *card, int num)
/* no, then find CPU DAI from registered DAIs*/ /* no, then find CPU DAI from registered DAIs*/
list_for_each_entry(cpu_dai, &dai_list, list) { list_for_each_entry(cpu_dai, &dai_list, list) {
if (!strcmp(cpu_dai->name, dai_link->cpu_dai_name)) { if (!strcmp(cpu_dai->name, dai_link->cpu_dai_name)) {
if (!try_module_get(cpu_dai->dev->driver->owner))
return -ENODEV;
rtd->cpu_dai = cpu_dai; rtd->cpu_dai = cpu_dai;
goto find_codec; goto find_codec;
} }
@@ -1621,12 +1617,17 @@ static int soc_probe_dai_link(struct snd_soc_card *card, int num)
rtd->pmdown_time = pmdown_time; rtd->pmdown_time = pmdown_time;
/* probe the cpu_dai */ /* probe the cpu_dai */
if (!cpu_dai->probed) { if (!cpu_dai->probed) {
if (!try_module_get(cpu_dai->dev->driver->owner))
return -ENODEV;
if (cpu_dai->driver->probe) { if (cpu_dai->driver->probe) {
ret = cpu_dai->driver->probe(cpu_dai); ret = cpu_dai->driver->probe(cpu_dai);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "asoc: failed to probe CPU DAI %s\n", printk(KERN_ERR "asoc: failed to probe CPU DAI %s\n",
cpu_dai->name); cpu_dai->name);
module_put(cpu_dai->dev->driver->owner);
return ret; return ret;
} }
} }