| commit | 8c9daae2cfe3b17f946ff998a692bddc9cd3e3b6 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Thu Jan 27 15:16:52 2011 +0000 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Thu Jan 27 15:16:52 2011 +0000 |
| tree | a8fbc31b406a5883d7777b1932c010828ab56ead | |
| parent | f85a9e0d260905f98d4ca6b66f0e64f63a729dba [diff] | |
| parent | c73e0c83f512012e7c357e516a0d7c0a832bfa34 [diff] |
Merge branch 'for-2.6.38' into for-2.6.39
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 8af47f7..e9f81c5 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c
@@ -1670,9 +1670,6 @@ goto out; found: - if (!try_module_get(codec->dev->driver->owner)) - return -ENODEV; - ret = soc_probe_codec(card, codec); if (ret < 0) return ret;