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;