Skip to content

Commit

Permalink
Merge branch 'device-properties'
Browse files Browse the repository at this point in the history
* device-properties:
  leds: leds-gpio: Fix the "default-state" property check
  • Loading branch information
Rafael J. Wysocki committed Dec 10, 2014
2 parents e3d857e + d735d25 commit fc813e5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/leds/leds-gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit fc813e5

Please sign in to comment.