From e844ecda0a1397022eaa68dcb68dc2afa926e762 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 5 Jul 2009 16:29:39 +0100
Subject: [PATCH] --- yaml --- r: 157547 b: refs/heads/master c:
 5420f30723122012c7bb868a55ff21c7d383b68e h: refs/heads/master i:   157545:
 d1a37269b95b4fa4b0cf9b9413c2e262c9903d50   157543:
 8af19a870a7147213d91224eacda9f234f582a4a v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/wm8988.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d61dd0e06aa7..66f801e838f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a01417e85846e42e939a345a294e8ae2287cc1f
+refs/heads/master: 5420f30723122012c7bb868a55ff21c7d383b68e
diff --git a/trunk/sound/soc/codecs/wm8988.c b/trunk/sound/soc/codecs/wm8988.c
index 03fac6a0f805..6f15acd10489 100644
--- a/trunk/sound/soc/codecs/wm8988.c
+++ b/trunk/sound/soc/codecs/wm8988.c
@@ -902,7 +902,7 @@ static int wm8988_register(struct wm8988_priv *wm8988)
 	ret = wm8988_reset(codec);
 	if (ret < 0) {
 		dev_err(codec->dev, "Failed to issue reset\n");
-		return ret;
+		goto err;
 	}
 
 	/* set the update bits (we always update left then right) */
@@ -926,18 +926,20 @@ static int wm8988_register(struct wm8988_priv *wm8988)
 	ret = snd_soc_register_codec(codec);
 	if (ret != 0) {
 		dev_err(codec->dev, "Failed to register codec: %d\n", ret);
-		return ret;
+		goto err;
 	}
 
 	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);
-		return ret;
+		goto err_codec;
 	}
 
 	return 0;
 
+err_codec:
+	snd_soc_unregister_codec(codec);
 err:
 	kfree(wm8988);
 	return ret;