From f77e119de376310319a8d6492bf9f6e95679f064 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Tue, 20 Nov 2012 14:54:18 +0100 Subject: [PATCH] --- yaml --- r: 336429 b: refs/heads/master c: dfa9751548444caadda2d6de1a2b67e05b34c2aa h: refs/heads/master i: 336427: 178248c4177c6ec1c14f8ad13b927167262825c0 v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/core.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fde1c1b12daa..bf35e6f8d50c 100644 --- 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 index 15f5ac864f14..33af811a6a3c 100644 --- 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;