From 8ee24eea9299779b3c4fe927bbefe5aaa6cbc509 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Sun, 19 Feb 2012 23:45:53 -0700 Subject: [PATCH] --- yaml --- r: 294075 b: refs/heads/master c: b1eed4ece7064c361d6e03f6706d90e4e9dd7e96 h: refs/heads/master i: 294073: be728c4a86f204fa20aeea0ec1044505fd7882b6 294071: 04ca3506436bbf4cf9802683b50fb16f4468eeeb v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/core.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 881c78aac514..c2ea61ae0d6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f026fe3d102e9d7f0d040109353ef5a97b5ef92c +refs/heads/master: b1eed4ece7064c361d6e03f6706d90e4e9dd7e96 diff --git a/trunk/drivers/pinctrl/core.c b/trunk/drivers/pinctrl/core.c index e2d4abb29d1a..fb3fbb76932e 100644 --- a/trunk/drivers/pinctrl/core.c +++ b/trunk/drivers/pinctrl/core.c @@ -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",