Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7857b996 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
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
parents 06ca7c43 8dc6ae4d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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);