summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-11-20 14:54:18 +0100
committerLinus Walleij <linus.walleij@linaro.org>2012-11-21 08:55:10 +0100
commitdfa9751548444caadda2d6de1a2b67e05b34c2aa (patch)
treecc34767ee97e0be020dd9fb4d6fb82a26e29768d /drivers
parent192c369c6165dff233f22aa70209a92b030d233d (diff)
downloadlinux-dfa9751548444caadda2d6de1a2b67e05b34c2aa.tar.bz2
pinctrl: make range registration defer properly
This makes the pinctrl_find_and_add_gpio_range() return -EPROBE_DEFER if the range hosting pin controller cannot be located. We may assume that the common case for why adding a range fails is that the targe pin controller device has not probed yet. Reviewed-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pinctrl/core.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 15f5ac864f14..33af811a6a3c 100644
--- a/drivers/pinctrl/core.c
+++ b/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;