Skip to content
Browse files

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
  • Loading branch information...
2 parents 06ca7c4 + 8dc6ae4 commit 7857b996c28c70e7a2c25930602f5fae4fe2b091 @torvalds torvalds committed Feb 18, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 drivers/pinctrl/core.c
View
2 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);

0 comments on commit 7857b99

Please sign in to comment.
Something went wrong with that request. Please try again.