From da83498f8201adfede2055ea754306dc131f02de Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 14 Jul 2010 20:12:57 +0100 Subject: [PATCH] --- yaml --- r: 206603 b: refs/heads/master c: 03b0dc02cf54a79d6bc2f49c0005bc07db5120a4 h: refs/heads/master i: 206601: 90da113516b4de24440fc2e78c5d6913b2a92424 206599: f11a9601eeccb38cf76d8a9229865fc037ec6580 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8727.c | 2 ++ trunk/sound/soc/codecs/wm8988.c | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f97456e7ff5d..4fbdb81ddb61 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c74a939d84730818bc9bf1efa5ad7184bb2f248 +refs/heads/master: 03b0dc02cf54a79d6bc2f49c0005bc07db5120a4 diff --git a/trunk/sound/soc/codecs/wm8727.c b/trunk/sound/soc/codecs/wm8727.c index 1072621e93fd..9d1df2628136 100644 --- a/trunk/sound/soc/codecs/wm8727.c +++ b/trunk/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/trunk/sound/soc/codecs/wm8988.c b/trunk/sound/soc/codecs/wm8988.c index 0417dae32e6f..19ad590ca0b3 100644 --- a/trunk/sound/soc/codecs/wm8988.c +++ b/trunk/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; }