Merge branch 'for-2.6.38' into for-2.6.39

8c9daae2 · Mark Brown · f85a9e0d · c73e0c83 · 8c9daae2
Commit 8c9daae2 authored Jan 27, 2011 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

sound/soc/soc-core.c sound/soc/soc-core.c +0 -3

No files found.
--- 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;