diff mbox

[4/7] gpiolib: return any error code from range creation

Message ID 1353420282-18066-1-git-send-email-linus.walleij@stericsson.com (mailing list archive)
State New, archived
Headers show

Commit Message

Linus Walleij Nov. 20, 2012, 2:04 p.m. UTC 
From: Linus Walleij <linus.walleij@linaro.org>

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.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 drivers/gpio/gpiolib.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Stephen Warren Nov. 20, 2012, 5:28 p.m. UTC | #1 
On 11/20/2012 07:04 AM, Linus Walleij wrote:
> From: Linus Walleij <linus.walleij@linaro.org>
> 
> 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.

I think patches 3 and 4 need to be squashed together to avoid any "git
bisect" issues?
Linus Walleij Nov. 21, 2012, 7:54 a.m. UTC | #2 
On Tue, Nov 20, 2012 at 6:28 PM, Stephen Warren <swarren@wwwdotorg.org> wrote:
> On 11/20/2012 07:04 AM, Linus Walleij wrote:
>> From: Linus Walleij <linus.walleij@linaro.org>
>>
>> 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.
>
> I think patches 3 and 4 need to be squashed together to avoid any "git
> bisect" issues?

OK that's correct I'll fix...

Linus Walleij
diff mbox

Patch

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index a59d13d..317ff04 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,