---

yaml --- r: 336429 b: refs/heads/master c: dfa9751 h: refs/heads/master i: 336427: 178248c v: v3
git-mirror · Nov 21, 2012 · f77e119 · f77e119
1 parent fefede0
commit f77e119
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 192c369c6165dff233f22aa70209a92b030d233d
+refs/heads/master: dfa9751548444caadda2d6de1a2b67e05b34c2aa
diff --git a/trunk/drivers/pinctrl/core.c b/trunk/drivers/pinctrl/core.c
@@ -350,8 +350,13 @@ struct pinctrl_dev *pinctrl_find_and_add_gpio_range(const char *devname,
 {
 	struct pinctrl_dev *pctldev = get_pinctrl_dev_from_devname(devname);
 
+	/*
+	 * If we can't find this device, let's assume that is because
+	 * it has not probed yet, so the driver trying to register this
+	 * range need to defer probing.
+	 */
 	if (!pctldev)
-		return NULL;
+		return ERR_PTR(-EPROBE_DEFER);
 
 	pinctrl_add_gpio_range(pctldev, range);
 	return pctldev;