From: Linus Walleij <linus.walleij@linaro.org>
Date: Wed, 1 Feb 2012 17:11:40 +0000 (+0100)
Subject: pinctrl: restore pin naming
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8dc6ae4d448758a30cf5fa822d6fe6f4e15a04c6;p=linux-beck.git

pinctrl: restore pin naming

Commit ca53c5f1ca5c936777caca46b7c716a40682ce83
("pinctrl: conjure names for unnamed pins") made pins lose
their identity and only get autogenerated names.

Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---

diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 8fe15cf15ac8..894cd5e103da 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -189,7 +189,7 @@ static int pinctrl_register_one_pin(struct pinctrl_dev *pctldev,
 	pindesc->pctldev = pctldev;
 
 	/* Copy basic pin info */
-	if (pindesc->name) {
+	if (name) {
 		pindesc->name = name;
 	} else {
 		pindesc->name = kasprintf(GFP_KERNEL, "PIN%u", number);