diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2012-02-01 12:11:40 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-02-01 13:35:21 -0500 |
commit | 8dc6ae4d448758a30cf5fa822d6fe6f4e15a04c6 (patch) | |
tree | 0cb92cc89c6ca6f5801a10fd1f4c5138bd95833a /drivers | |
parent | 62aa2b537c6f5957afd98e29f96897419ed5ebab (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/pinctrl/core.c | 2 |
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, | |||
189 | pindesc->pctldev = pctldev; | 189 | pindesc->pctldev = pctldev; |
190 | 190 | ||
191 | /* Copy basic pin info */ | 191 | /* Copy basic pin info */ |
192 | if (pindesc->name) { | 192 | if (name) { |
193 | pindesc->name = name; | 193 | pindesc->name = name; |
194 | } else { | 194 | } else { |
195 | pindesc->name = kasprintf(GFP_KERNEL, "PIN%u", number); | 195 | pindesc->name = kasprintf(GFP_KERNEL, "PIN%u", number); |