[PATCH] led: try to get LED's label from the 'label' property
Sascha Hauer
s.hauer at pengutronix.de
Sun Jul 27 22:49:17 PDT 2014
On Sun, Jul 27, 2014 at 12:35:52PM +0400, Antony Pavlov wrote:
> Signed-off-by: Antony Pavlov <antonynpavlov at gmail.com>
> ---
> drivers/led/led-gpio.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/led/led-gpio.c b/drivers/led/led-gpio.c
> index 7bb3b49..cddac08 100644
> --- a/drivers/led/led-gpio.c
> +++ b/drivers/led/led-gpio.c
> @@ -212,7 +212,9 @@ static int led_gpio_of_probe(struct device_d *dev)
> continue;
>
> gled = xzalloc(sizeof(*gled));
> - gled->led.name = xstrdup(child->name);
> + gled->led.name = xstrdup(of_get_property(child, "label", NULL));
When the property doesn't exist you pass NULL to xstrdup. This will
crash. You'll have to add a check or make xstrdup tolerate NULL
pointers.
Sascha
> + if (!gled->led.name)
> + gled->led.name = xstrdup(child->name);
> gled->gpio = gpio;
> gled->active_low = (flags & OF_GPIO_ACTIVE_LOW) ? 1 : 0;
>
> --
> 2.0.1
>
>
> _______________________________________________
> barebox mailing list
> barebox at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
More information about the barebox
mailing list