From 7ac4b3256e8043fe8ccfe402ba2fa429ccfbe707 Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Thu, 7 Mar 2013 17:42:33 -0800
Subject: [PATCH] --- yaml --- r: 371874 b: refs/heads/master c:
 e1328a832c7eeeb4dd3c3666605717c555de9e83 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/sound/soc/soc-core.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b91ec0dcf445..e76cabfaedbd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2db6be6a7b3edc8a5acea99b817eb7b9e608e931
+refs/heads/master: e1328a832c7eeeb4dd3c3666605717c555de9e83
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
index e02c374d2243..0ce075c47b25 100644
--- a/trunk/sound/soc/soc-core.c
+++ b/trunk/sound/soc/soc-core.c
@@ -4096,6 +4096,10 @@ int snd_soc_register_codec(struct device *dev,
 	return 0;
 
 fail_codec_name:
+	mutex_lock(&client_mutex);
+	list_del(&codec->list);
+	mutex_unlock(&client_mutex);
+
 	kfree(codec->name);
 fail_codec:
 	kfree(codec);