From 187b5dc47e7dbad852205f5303a1cfa12f5bcbf8 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Tue, 25 Sep 2012 12:41:40 +0530
Subject: [PATCH] --- yaml --- r: 328489 b: refs/heads/master c:
 eb26cc9c71f81f44777bbf5ca1bd72aa76997786 h: refs/heads/master i:   328487:
 b3e66fa8dcb576b3431537bcf37d92cb1acecf97 v: v3

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

diff --git a/[refs] b/[refs]
index 8323228898ba..59a1078c8e89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c854723c8bea457d3418ea2f398b6cfbcb3988e
+refs/heads/master: eb26cc9c71f81f44777bbf5ca1bd72aa76997786
diff --git a/trunk/drivers/pinctrl/core.c b/trunk/drivers/pinctrl/core.c
index dc5c126e398a..0f1ec9e8ff14 100644
--- a/trunk/drivers/pinctrl/core.c
+++ b/trunk/drivers/pinctrl/core.c
@@ -230,8 +230,10 @@ static int pinctrl_register_one_pin(struct pinctrl_dev *pctldev,
 		pindesc->name = name;
 	} else {
 		pindesc->name = kasprintf(GFP_KERNEL, "PIN%u", number);
-		if (pindesc->name == NULL)
+		if (pindesc->name == NULL) {
+			kfree(pindesc);
 			return -ENOMEM;
+		}
 		pindesc->dynamic_name = true;
 	}