From 768df51d2c320dab62e02b842e33307617bb2c9f Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Fri, 23 Jul 2010 05:53:47 +0000
Subject: [PATCH] --- yaml --- r: 206639 b: refs/heads/master c:
 2c2749de118bd36645b3a4a56f0d8ef6d4fd09cf h: refs/heads/master i:   206637:
 805003f3487476b3ae8eb0430bc1c0c580ceff9b   206635:
 5095bb4431792a03b0d04dfe6def4a62542f6bde   206631:
 a319f2a2e329ae91d1d85611d6ecd582bc1fc85f   206623:
 d2a38ce05152bde4faf32e12bc4dc7d85fe6d9d3 v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/wm8711.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2c042214a6be..4411a8fc4106 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef99e9b5a10086bcc529e6c0a11c6539caee8cd1
+refs/heads/master: 2c2749de118bd36645b3a4a56f0d8ef6d4fd09cf
diff --git a/trunk/sound/soc/codecs/wm8711.c b/trunk/sound/soc/codecs/wm8711.c
index effb14eee7d4..e2dba07f0260 100644
--- a/trunk/sound/soc/codecs/wm8711.c
+++ b/trunk/sound/soc/codecs/wm8711.c
@@ -439,7 +439,8 @@ static int wm8711_register(struct wm8711_priv *wm8711,
 
 	if (wm8711_codec) {
 		dev_err(codec->dev, "Another WM8711 is registered\n");
-		return -EINVAL;
+		ret = -EINVAL;
+		goto err;
 	}
 
 	mutex_init(&codec->mutex);