Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 294075
b: refs/heads/master
c: b1eed4e
h: refs/heads/master
i:
  294073: be728c4
  294071: 04ca350
v: v3
  • Loading branch information
Stephen Warren authored and Linus Walleij committed Feb 22, 2012
1 parent 3e306bb commit 8ee24ee
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f026fe3d102e9d7f0d040109353ef5a97b5ef92c
refs/heads/master: b1eed4ece7064c361d6e03f6706d90e4e9dd7e96
13 changes: 6 additions & 7 deletions trunk/drivers/pinctrl/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -518,13 +518,12 @@ static struct pinctrl *pinctrl_get_locked(struct device *dev, const char *name)
*/
pctldev = get_pinctrl_dev_from_devname(map->ctrl_dev_name);
if (!pctldev) {
pr_warning("could not find a pinctrl device for pinmux function %s, fishy, they shall all have one\n",
map->function);
pr_warning("given pinctrl device name: %s",
map->ctrl_dev_name);

/* Continue to check the other mappings anyway... */
continue;
dev_err(dev, "unknown pinctrl device %s in map entry",
map->ctrl_dev_name);
pinmux_put(p);
kfree(p);
/* Eventually, this should trigger deferred probe */
return ERR_PTR(-ENODEV);
}

pr_debug("in map, found pctldev %s to handle function %s",
Expand Down

0 comments on commit 8ee24ee

Please sign in to comment.