chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd-wait-online: flush monitor events after processing
[elogind.git]
/
src
/
backlight
/
backlight.c
diff --git
a/src/backlight/backlight.c
b/src/backlight/backlight.c
index c708391612a289352d39c9620d22b08b6ee953ca..691472cc3a9d9499b0de9af958c4434c223e28b2 100644
(file)
--- a/
src/backlight/backlight.c
+++ b/
src/backlight/backlight.c
@@
-229,7
+229,7
@@
static unsigned get_max_brightness(struct udev_device *device) {
* would otherwise force the user to disable state restoration. */
static void clamp_brightness(struct udev_device *device, char **value, unsigned max_brightness) {
int r;
* would otherwise force the user to disable state restoration. */
static void clamp_brightness(struct udev_device *device, char **value, unsigned max_brightness) {
int r;
- unsigned brightness, new_brightness;
+ unsigned brightness, new_brightness
, min_brightness
;
r = safe_atou(*value, &brightness);
if (r < 0) {
r = safe_atou(*value, &brightness);
if (r < 0) {
@@
-237,7
+237,8
@@
static void clamp_brightness(struct udev_device *device, char **value, unsigned
return;
}
return;
}
- new_brightness = MAX3(brightness, 1U, max_brightness/20);
+ min_brightness = MAX(1U, max_brightness/20);
+ new_brightness = CLAMP(brightness, min_brightness, max_brightness);
if (new_brightness != brightness) {
char *old_value = *value;
if (new_brightness != brightness) {
char *old_value = *value;
@@
-247,7
+248,11
@@
static void clamp_brightness(struct udev_device *device, char **value, unsigned
return;
}
return;
}
- log_debug("Saved brightness %s too low; increasing to %s.", old_value, *value);
+ log_info("Saved brightness %s %s to %s.", old_value,
+ new_brightness > brightness ?
+ "too low; increasing" : "too high; decreasing",
+ *value);
+
free(old_value);
}
}
free(old_value);
}
}