diff options
| author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2015-04-15 00:53:18 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-04-17 07:23:47 +0200 |
| commit | 62adc52ed513e3080e2be6a233de4e06a90d1042 (patch) | |
| tree | 97b36007be5e1f64de45e793bbec739e66385feb /drivers/led | |
| parent | c6a9698dc1e54d8be388573167786da1e3ed85a8 (diff) | |
| download | barebox-62adc52ed513e3080e2be6a233de4e06a90d1042.tar.gz barebox-62adc52ed513e3080e2be6a233de4e06a90d1042.tar.xz | |
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>
Diffstat (limited to 'drivers/led')
| -rw-r--r-- | drivers/led/led-gpio.c | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/drivers/led/led-gpio.c b/drivers/led/led-gpio.c index ae3f13f45b..807251721f 100644 --- a/drivers/led/led-gpio.c +++ b/drivers/led/led-gpio.c @@ -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[] = { |