summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-02-01 21:11:40 +0400
committerLinus Walleij <linus.walleij@linaro.org>2012-02-01 22:35:21 +0400
commit8dc6ae4d448758a30cf5fa822d6fe6f4e15a04c6 (patch)
tree0cb92cc89c6ca6f5801a10fd1f4c5138bd95833a
parent62aa2b537c6f5957afd98e29f96897419ed5ebab (diff)
downloadlinux-8dc6ae4d448758a30cf5fa822d6fe6f4e15a04c6.tar.xz
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>
-rw-r--r--drivers/pinctrl/core.c2
1 files changed, 1 insertions, 1 deletions
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);