diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-24 16:48:27 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-24 16:48:27 -0800 |
| commit | ffd76d8be36da09f8456c55569c008f5aa93095e (patch) | |
| tree | 4a5e537edcdd3be9197c5fb7af1b4f7e4780ef77 /drivers/pinctrl/core.c | |
| parent | bfe9c8ae114009491f51452ec727667d516ee79f (diff) | |
| parent | f0e15e2b0c6b3e89daade25a1e9a2d80136c14c3 (diff) | |
| download | linux-ffd76d8be36da09f8456c55569c008f5aa93095e.tar.bz2 | |
Merge branch 'for_3.4/dts_updates' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into dt
Diffstat (limited to 'drivers/pinctrl/core.c')
| -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, pindesc->pctldev = pctldev; /* Copy basic pin info */ - if (pindesc->name) { + if (name) { pindesc->name = name; } else { pindesc->name = kasprintf(GFP_KERNEL, "PIN%u", number); |