From d8bcf7d3ba25a708c8212b92fdc6e089cd7a754b Mon Sep 17 00:00:00 2001 From: Roland Stigge Date: Thu, 28 Jun 2012 00:32:14 +0200 Subject: [PATCH] --- yaml --- r: 318459 b: refs/heads/master c: 4fbb0022cba37eef4a263183fdb7dbee89b299f2 h: refs/heads/master i: 318457: d8b8ac0256eddda677df136cb60ba8e1566d29fb 318455: 3f182f4ce932723e04837e14aebfbdc7ce3add74 v: v3 --- [refs] | 2 +- trunk/drivers/gpio/gpiolib-of.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index db338a85364d..5d815ab01d90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e93545763021988def06fbda28fe5da133589a96 +refs/heads/master: 4fbb0022cba37eef4a263183fdb7dbee89b299f2 diff --git a/trunk/drivers/gpio/gpiolib-of.c b/trunk/drivers/gpio/gpiolib-of.c index a71aecac451f..a18c4aa68b1e 100644 --- a/trunk/drivers/gpio/gpiolib-of.c +++ b/trunk/drivers/gpio/gpiolib-of.c @@ -62,7 +62,10 @@ static int of_gpiochip_find_and_xlate(struct gpio_chip *gc, void *data) int of_get_named_gpio_flags(struct device_node *np, const char *propname, int index, enum of_gpio_flags *flags) { - struct gg_data gg_data = { .flags = flags, .out_gpio = -ENODEV }; + /* Return -EPROBE_DEFER to support probe() functions to be called + * later when the GPIO actually becomes available + */ + struct gg_data gg_data = { .flags = flags, .out_gpio = -EPROBE_DEFER }; int ret; /* .of_xlate might decide to not fill in the flags, so clear it. */