Merge tag 'gpio-v3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio

torvalds · torvalds · commit 1ad96bb0a20f · 2014-06-14T14:49:51.000-07:00
Pull GPIO fix from Linus Walleij:
 "A first GPIO fix for the v3.16 series, this was serious since it
  blocks the OMAP boot.

  Sending you this vital fix before leaving for a short vacation so it
  does not sit collecting dust in my tree for no good reason.

  Apart from this, our v3.16 cycle looks like a good start"

* tag 'gpio-v3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: of: Fix handling for deferred probe for -gpio suffix
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`