Merge branch 'device-properties'

* device-properties: leds: leds-gpio: Fix the "default-state" property check

Merge branch 'device-properties'
* device-properties: leds: leds-gpio: Fix the "default-state" property check
fc813e50 · Rafael J. Wysocki · e3d857e1 · d735d25e · fc813e50
Commit fc813e50 authored Dec 10, 2014 by Rafael J. Wysocki
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/leds/leds-gpio.c drivers/leds/leds-gpio.c +1 -1

No files found.
--- 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;