浏览代码

pinctrl: error if mapping table's control dev can't be found

This is a serious error, and the pin control system will not function
correctly if it ends up not programing the mapping table entries into
the HW. Instead of just ignoring this, error out.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
[rebased to fit the applied patch series, cast error to pointer]
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Stephen Warren 13 年之前
父节点
当前提交
b1eed4ece7
共有 1 个文件被更改,包括 6 次插入7 次删除
  1. 6 7
      drivers/pinctrl/core.c

+ 6 - 7
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);
 		pctldev = get_pinctrl_dev_from_devname(map->ctrl_dev_name);
 		if (!pctldev) {
 		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",
 		pr_debug("in map, found pctldev %s to handle function %s",