diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-27 09:20:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-27 09:20:42 -0700 |
| commit | e5585453498907080c456ec5b51131867ed6d095 (patch) | |
| tree | ab8961a2d48a2a06b4e9d103f7906e2573eb8c07 | |
| parent | b59dfdaef173677b0b7e10f375226c0a1114fd20 (diff) | |
| parent | 72b8ad40e14302f869382656a914bb803796b4ed (diff) | |
Merge tag 'led-fix-for-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds
Pull LED fix from Jacek Anaszewski.
* tag 'led-fix-for-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds:
leds: gpio: set led_dat->gpiod pointer for OF defined GPIO leds
| -rw-r--r-- | drivers/leds/leds-gpio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c index 32fa752565bc..45e012093865 100644 --- a/drivers/leds/leds-gpio.c +++ b/drivers/leds/leds-gpio.c @@ -163,6 +163,8 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev) return ERR_CAST(led.gpiod); } + led_dat->gpiod = led.gpiod; + fwnode_property_read_string(child, "linux,default-trigger", &led.default_trigger); |