gpio: of: Fix handling for deferred probe for -gpio suffix

tmlind · linusw · commit 06fc3b70f1dc · 2014-06-12T09:57:00.000+02:00
Commit dd34c37 (gpio: of: Allow -gpio suffix for property names) added parsing for both -gpio and -gpios suffix but also changed the handling for deferred probe unintentionally. Because of the looping the second name will now return -ENOENT instead of -EPROBE_DEFER. Fix the issue by breaking out of the loop if -EPROBE_DEFER is encountered. Signed-off-by: Tony Lindgren <tony@atomide.com> Reviewed-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
@@ -2614,7 +2614,7 @@ static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
 
 		desc = of_get_named_gpiod_flags(dev->of_node, prop_name, idx,
 						&of_flags);
-		if (!IS_ERR(desc))
+		if (!IS_ERR(desc) || (PTR_ERR(desc) == -EPROBE_DEFER))
 			break;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -2614,7 +2614,7 @@ static struct gpio_desc of_find_gpio(struct device dev, const char *con_id,`
`2614`	`2614`
`2615`	`2615`	`desc = of_get_named_gpiod_flags(dev->of_node, prop_name, idx,`
`2616`	`2616`	`&of_flags);`
`2617`		`- if (!IS_ERR(desc))`
	`2617`	`+ if (!IS_ERR(desc) \|\| (PTR_ERR(desc) == -EPROBE_DEFER))`
`2618`	`2618`	`break;`
`2619`	`2619`	`}`
`2620`	`2620`