summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJarkko Nikula <jhnikula@gmail.com>2011-01-26 16:39:37 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-26 20:26:54 +0000
commitc73e0c83f512012e7c357e516a0d7c0a832bfa34 (patch)
tree9dbcec5f2cff0db531943f55303f6b57d1f70b62
parenta3adfa00e8089aa72826c6ba04bcb18cfceaf0a9 (diff)
ASoC: Fix module refcount for auxiliary devices
Commit f6c2ed5 "ASoC: Fix the device references to codec and platform drivers" moved codec driver refcount increments from soc_bind_dai_link into soc_probe_codec. However, the commit didn't remove try_module_get from soc_probe_aux_dev so the auxiliary device reference counts are incremented twice as the soc_probe_codec is called from soc_probe_aux_dev too. Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/soc-core.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index bac7291b6ff6..c4b60610beb0 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1664,9 +1664,6 @@ static int soc_probe_aux_dev(struct snd_soc_card *card, int num)
goto out;
found:
- if (!try_module_get(codec->dev->driver->owner))
- return -ENODEV;
-
ret = soc_probe_codec(card, codec);
if (ret < 0)
return ret;