diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-07-14 21:12:57 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-07-14 21:12:57 +0200 |
| commit | 03b0dc02cf54a79d6bc2f49c0005bc07db5120a4 (patch) | |
| tree | 8016fc87cbda697adedab63c65a60e790f7f105c /sound | |
| parent | ASoC: au1x: fix section mismatch in psc-i2s.c (diff) | |
| parent | ASoC:: remove a redundant snd_soc_unregister_codec call in wm8988_register (diff) | |
| download | linux-03b0dc02cf54a79d6bc2f49c0005bc07db5120a4.tar.xz linux-03b0dc02cf54a79d6bc2f49c0005bc07db5120a4.zip | |
Merge branch 'for-2.6.35' into for-2.6.36
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8727.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/wm8988.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8727.c b/sound/soc/codecs/wm8727.c index 1072621e93fd..9d1df2628136 100644 --- a/sound/soc/codecs/wm8727.c +++ b/sound/soc/codecs/wm8727.c @@ -127,6 +127,8 @@ static __devinit int wm8727_platform_probe(struct platform_device *pdev) goto err_codec; } + return 0; + err_codec: snd_soc_unregister_codec(codec); err: diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c index 0417dae32e6f..19ad590ca0b3 100644 --- a/sound/soc/codecs/wm8988.c +++ b/sound/soc/codecs/wm8988.c @@ -885,7 +885,6 @@ static int wm8988_register(struct wm8988_priv *wm8988, ret = snd_soc_register_dai(&wm8988_dai); if (ret != 0) { dev_err(codec->dev, "Failed to register DAI: %d\n", ret); - snd_soc_unregister_codec(codec); goto err_codec; } |