summaryrefslogtreecommitdiffstats
path: root/drivers/gpio
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-11-20 14:56:25 +0100
committerLinus Walleij <linus.walleij@linaro.org>2012-11-21 08:55:11 +0100
commit8f23ca1a73a096f21e6618d8e23df613daa5e532 (patch)
tree3a5395021e8468b50e973a3978b497241b94e7de /drivers/gpio
parentdfa9751548444caadda2d6de1a2b67e05b34c2aa (diff)
downloadlinux-8f23ca1a73a096f21e6618d8e23df613daa5e532.tar.bz2
gpiolib: return any error code from range creation
If we try to create a range for a certain GPIO chip and the target pin controller is not yet available it may return a probe deferral error code, so handle this all the way our by checking the error code. 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/gpio')
-rw-r--r--drivers/gpio/gpiolib.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index a59d13d746c5..317ff0440e29 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1218,10 +1218,11 @@ int gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,
pin_range->range.npins = npins;
pin_range->pctldev = pinctrl_find_and_add_gpio_range(pinctl_name,
&pin_range->range);
- if (!pin_range->pctldev) {
+ if (IS_ERR(pin_range->pctldev)) {
pr_err("%s: GPIO chip: could not create pin range\n",
chip->label);
kfree(pin_range);
+ return PTR_ERR(pin_range->pctldev);
}
pr_debug("%s: GPIO chip: created GPIO range %d->%d ==> PIN %d->%d\n",
chip->label, offset, offset + npins - 1,