From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 5 Jul 2009 15:29:39 +0000 (+0100)
Subject: ASoC: Fix leaks in WM8988 registration error handling
X-Git-Tag: upstream/snapshot3+hdmi~15960^2~202^2~84
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5420f30723122012c7bb868a55ff21c7d383b68e;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

ASoC: Fix leaks in WM8988 registration error handling

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c
index 03fac6a..6f15acd 100644
--- a/sound/soc/codecs/wm8988.c
+++ b/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;