aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-02-18 15:27:40 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-02-18 15:27:40 -0800
commit7857b996c28c70e7a2c25930602f5fae4fe2b091 (patch)
tree3011fd3dd7be12b4811ee8ae73b154a8dc202944
parent06ca7c4376b779e6cb11527abc4f609ddca35b58 (diff)
parent8dc6ae4d448758a30cf5fa822d6fe6f4e15a04c6 (diff)
Merge tag 'pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
pinctrl fixes for v3.3 * tag 'pinctrl-for-torvalds-20120216' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: pinctrl: restore pin naming
-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 8fe15cf15ac..894cd5e103d 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);