diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-10 22:17:12 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-10 22:17:12 +0100 |
| commit | fc813e50d3a43bc5d2527384fcb76519c6808986 (patch) | |
| tree | 55a6008c17d609c5be3eebb09b853e1766b7e6f9 /drivers | |
| parent | e3d857e1ae787a5e268bc89425aadae09c8e95a4 (diff) | |
| parent | d735d25e60fffeffc256fa5d59551dc92dc07e36 (diff) | |
| download | linux-stable-fc813e50d3a43bc5d2527384fcb76519c6808986.tar.gz linux-stable-fc813e50d3a43bc5d2527384fcb76519c6808986.tar.bz2 linux-stable-fc813e50d3a43bc5d2527384fcb76519c6808986.zip | |
Merge branch 'device-properties'
* device-properties:
leds: leds-gpio: Fix the "default-state" property check
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/leds/leds-gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c index 868e6fc17cba..5fb4440127d9 100644 --- a/drivers/leds/leds-gpio.c +++ b/drivers/leds/leds-gpio.c @@ -203,7 +203,7 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev) fwnode_property_read_string(child, "linux,default-trigger", &led.default_trigger); - if (!fwnode_property_read_string(child, "linux,default_state", + if (!fwnode_property_read_string(child, "default-state", &state)) { if (!strcmp(state, "keep")) led.default_state = LEDS_GPIO_DEFSTATE_KEEP; |