sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

led: gpio: Properly deal with deferred probing 

GPIO LEDs can suffer from deferred probing due to failing gpio request.
Instead of registering each gpio led independently, pre-allocate an
array of struct gpio_led for all and tear it down properly if probing
of one leds fails. While at it, silence error messages on -EPROBE_DEFER.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sebastian Hesselbarth 2015-04-15 00:53:18 +02:00 committed by Sascha Hauer
parent c6a9698dc1
commit 62adc52ed5
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/led/led-gpio.c
View File

@ -20,6 +20,7 @@
#include <common.h>
#include <init.h>
#include <led.h>
#include <malloc.h>
#include <gpio.h>
#include <of_gpio.h>
@ -201,19 +202,32 @@ void led_gpio_rgb_unregister(struct gpio_led *led)
static int led_gpio_of_probe(struct device_d *dev)
{
struct device_node *child;
struct gpio_led *leds;
int num_leds;
int ret = 0, n = 0;
num_leds = of_get_child_count(dev->device_node);
if (num_leds <= 0)
return num_leds;
leds = xzalloc(num_leds * sizeof(struct gpio_led));
for_each_child_of_node(dev->device_node, child) {
struct gpio_led *gled;
struct gpio_led *gled = &leds[n];
const char *default_state;
enum of_gpio_flags flags;
int gpio;
const char *label;
gpio = of_get_named_gpio_flags(child, "gpios", 0, &flags);
if (gpio < 0)
continue;
if (gpio < 0) {
if (gpio != -EPROBE_DEFER)
dev_err(dev, "failed to get gpio for %s: %d\n",
child->full_name, gpio);
ret = gpio;
goto err;
}
gled = xzalloc(sizeof(*gled));
if (of_property_read_string(child, "label", &label))
label = child->name;
gled->led.name = xstrdup(label);
@ -233,9 +247,17 @@ static int led_gpio_of_probe(struct device_d *dev)
else if (!strcmp(default_state, "off"))
led_gpio_set(&gled->led, 0);
}
n++;
}
return 0;
err:
for (n = n - 1; n >= 0; n--)
led_gpio_unregister(&leds[n]);
free(leds);
return ret;
}
static struct of_device_id led_gpio_of_ids[] = {