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

Commit c0d1ec7b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "leds: led-class: Retain the latest user brightness request"

parents 8868e5d7 919bea9f

drivers/leds/led-class.c

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

		return ret;



	led_cdev->usr_brightness_req = state;

	__led_set_brightness(led_cdev, state);



	return size;
@@ -71,7 +72,7 @@ static ssize_t led_max_brightness_store(struct device *dev, 
		if (state > LED_FULL)

			state = LED_FULL;

		led_cdev->max_brightness = state;

		led_set_brightness(led_cdev, led_cdev->brightness);

		led_set_brightness(led_cdev, led_cdev->usr_brightness_req);

	}



	return ret;

include/linux/leds.h

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ struct led_classdev { 
	const char		*name;

	int			 brightness;

	int			 max_brightness;

	int			 usr_brightness_req;

	int			 flags;



	/* Lower 16 bits reflect status */