diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-12-04 02:28:19 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-04 02:28:19 +0100 |
| commit | 29470ea8d828e4dec74e94f7f17b7479ff5ef276 (patch) | |
| tree | ff84d6c5c98e4317dc340e81557d7217b0d10203 /drivers/leds | |
| parent | ec98a4975e66a3aa366cd227edab027b01adea37 (diff) | |
| download | linux-stable-29470ea8d828e4dec74e94f7f17b7479ff5ef276.tar.gz linux-stable-29470ea8d828e4dec74e94f7f17b7479ff5ef276.tar.bz2 linux-stable-29470ea8d828e4dec74e94f7f17b7479ff5ef276.zip | |
leds: leds-gpio: Fix multiple instances registration without 'label' property
Since commit a43f2cbbb009f96 ("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: a43f2cbbb009 (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>
Diffstat (limited to 'drivers/leds')
| -rw-r--r-- | drivers/leds/leds-gpio.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c index b3c5d9d6a42b..868e6fc17cba 100644 --- a/drivers/leds/leds-gpio.c +++ b/drivers/leds/leds-gpio.c @@ -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; } - fwnode_property_read_string(child, "label", &led.name); + 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); |