Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f7a4ceb authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "leds: add flag to keep trigger always" into msm-4.8

parents 75e7c278 60f54592

drivers/leds/led-class.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static ssize_t brightness_store(struct device *dev, 
	if (ret)

		goto unlock;



	if (state == LED_OFF)

	if (state == LED_OFF && !(led_cdev->flags & LED_KEEP_TRIGGER))

		led_trigger_remove(led_cdev);

	led_set_brightness(led_cdev, state);

include/linux/leds.h

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ struct led_classdev { 
#define LED_DEV_CAP_FLASH	(1 << 24)

#define LED_HW_PLUGGABLE	(1 << 25)

#define LED_PANIC_INDICATOR	(1 << 26)

#define LED_KEEP_TRIGGER	(1 << 27)



	/* Set LED brightness level

	 * Must not sleep. Use brightness_set_blocking for drivers