Merge branch 'for-2.6.38' into for-2.6.39

2011-01-27 15:16:52 +00:00 · 2011-01-27 15:16:52 +00:00 · 8c9daae2cf
parent f85a9e0d26 c73e0c83f5
commit 8c9daae2cf
1 changed files with 0 additions and 3 deletions
--- 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;