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

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);