Merge branch 'for-2.6.38' into for-2.6.39

This commit is contained in:
Mark Brown
2011-01-27 15:16:52 +00:00

View File

@@ -1670,9 +1670,6 @@ static int soc_probe_aux_dev(struct snd_soc_card *card, int num)
goto out; goto out;
found: found:
if (!try_module_get(codec->dev->driver->owner))
return -ENODEV;
ret = soc_probe_codec(card, codec); ret = soc_probe_codec(card, codec);
if (ret < 0) if (ret < 0)
return ret; return ret;