summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-27 15:16:52 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-27 15:16:52 +0000
commit8c9daae2cfe3b17f946ff998a692bddc9cd3e3b6 (patch)
treea8fbc31b406a5883d7777b1932c010828ab56ead /sound/soc/soc-core.c
parentf85a9e0d260905f98d4ca6b66f0e64f63a729dba (diff)
parentc73e0c83f512012e7c357e516a0d7c0a832bfa34 (diff)
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/soc-core.c')
-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 8af47f7a8fc..e9f81c551e5 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1670,9 +1670,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;