From 9039b51b4aec002d12c22d1cbff3ecd3fd226206 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Wed, 19 Oct 2011 16:19:27 -0600
Subject: [PATCH] --- yaml --- r: 267025 b: refs/heads/master c:
 9af1e44fb4a4c62a90bff9b095eb001764d91b65 h: refs/heads/master i:   267023:
 47a06813c1beee4e2f1dfff4bc8f4c6517daa55a v: v3

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

diff --git a/[refs] b/[refs]
index a6c548f7ff90..7463006f0414 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25aec320d993950474a065b59585e8dd006c3e18
+refs/heads/master: 9af1e44fb4a4c62a90bff9b095eb001764d91b65
diff --git a/trunk/drivers/pinctrl/core.c b/trunk/drivers/pinctrl/core.c
index ceb63275c7fe..423522d87313 100644
--- a/trunk/drivers/pinctrl/core.c
+++ b/trunk/drivers/pinctrl/core.c
@@ -164,9 +164,8 @@ static int pinctrl_register_one_pin(struct pinctrl_dev *pctldev,
 	/* Set owner */
 	pindesc->pctldev = pctldev;
 
-	/* Copy optional basic pin info */
-	if (name)
-		strlcpy(pindesc->name, name, sizeof(pindesc->name));
+	/* Copy basic pin info */
+	pindesc->name = name;
 
 	spin_lock(&pctldev->pin_desc_tree_lock);
 	radix_tree_insert(&pctldev->pin_desc_tree, number, pindesc);
diff --git a/trunk/drivers/pinctrl/core.h b/trunk/drivers/pinctrl/core.h
index 17e07772160c..e431aa537287 100644
--- a/trunk/drivers/pinctrl/core.h
+++ b/trunk/drivers/pinctrl/core.h
@@ -55,7 +55,7 @@ struct pinctrl_dev {
  */
 struct pin_desc {
 	struct pinctrl_dev *pctldev;
-	char	name[16];
+	const char *name;
 	spinlock_t lock;
 	/* These fields only added when supporting pinmux drivers */
 #ifdef CONFIG_PINMUX