Commit 29470ea8 authored Dec 04, 2014 by Fabio Estevam Committed by Rafael J. Wysocki Dec 04, 2014

leds: leds-gpio: Fix multiple instances registration without 'label' property



Since commit a43f2cbb ("leds: leds-gpio: Make use of device property
API") it is no longer possible to register multiple gpio leds without passing
the 'label' property.

According to Documentation/devicetree/bindings/leds/common.txt:

"Optional properties for child nodes:
- label : The label for this LED.  If omitted, the label is
  taken from the node name (excluding the unit address)."

So retrieve the node name when the 'label' property is absent to keep the old
behaviour and fix this regression.

Fixes: a43f2cbb (leds: leds-gpio: Make use of device property API)
Reported-by: Jean-Michel Hautbois <jean-michel.hautbois@vodalys.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Grant Likely <grant.likely@linaro.org>
Acked-by: Bryan Wu <cooloney@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent ec98a497

drivers/leds/leds-gpio.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -170,6 +170,7 @@ static struct gpio_leds_priv gpio_leds_create(struct platform_device pdev)
		struct fwnode_handle *child;
		struct gpio_leds_priv *priv;
		int count, ret;
		struct device_node *np;

		count = device_get_child_node_count(dev);
		if (!count)
		@@ -189,7 +190,16 @@ static struct gpio_leds_priv gpio_leds_create(struct platform_device pdev)
		goto err;
		}

		np = of_node(child);

		if (fwnode_property_present(child, "label")) {
		fwnode_property_read_string(child, "label", &led.name);
		} else {
		if (IS_ENABLED(CONFIG_OF) && !led.name && np)
		led.name = np->name;
		if (!led.name)
		return ERR_PTR(-EINVAL);
		}
		fwnode_property_read_string(child, "linux,default-trigger",
		&led.default_trigger);

Admin message