From ef6389718bcc4b95ca3dcf85282a11b2877de5b9 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Mon, 22 Oct 2012 12:58:09 +0800
Subject: [PATCH] --- yaml --- r: 334811 b: refs/heads/master c:
 b4dd784ba8af03bf1f9ee5118c792d7abd4919bd h: refs/heads/master i:   334809:
 312fbdfbf5321cb441f6225c64e06a5014da5402   334807:
 5b644387a26800be84808fcdcb6cb6dcadb4cfe1 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/pinctrl/core.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8a9979e855ed..65e9e8bc324f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 268300be0e1a0b06582af55251294b268c3d4654
+refs/heads/master: b4dd784ba8af03bf1f9ee5118c792d7abd4919bd
diff --git a/trunk/drivers/pinctrl/core.c b/trunk/drivers/pinctrl/core.c
index 0f1ec9e8ff14..2e39c04fc16b 100644
--- a/trunk/drivers/pinctrl/core.c
+++ b/trunk/drivers/pinctrl/core.c
@@ -1061,8 +1061,10 @@ static int pinctrl_groups_show(struct seq_file *s, void *what)
 			seq_printf(s, "group: %s\n", gname);
 			for (i = 0; i < num_pins; i++) {
 				pname = pin_get_name(pctldev, pins[i]);
-				if (WARN_ON(!pname))
+				if (WARN_ON(!pname)) {
+					mutex_unlock(&pinctrl_mutex);
 					return -EINVAL;
+				}
 				seq_printf(s, "pin %d (%s)\n", pins[i], pname);
 			}
 			seq_puts(s, "\n");