X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbacklight%2Fbacklight.c;h=1271a66983392c8dc1a692eb0b6f83f4f47c46f9;hb=cb01aedc3b4ba70859267159fe716253e3551ec6;hp=691472cc3a9d9499b0de9af958c4434c223e28b2;hpb=0c9d8f1d4b5018199cb5a9b57580dc1480a7f915;p=elogind.git

diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index 691472cc3..1271a6698 100644
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -211,7 +211,7 @@ static unsigned get_max_brightness(struct udev_device *device) {
 
         r = safe_atou(max_brightness_str, &max_brightness);
         if (r < 0) {
-                log_warning("Failed to parse 'max_brightness' \"%s\": %s", max_brightness_str, strerror(-r));
+                log_warning_errno(r, "Failed to parse 'max_brightness' \"%s\": %m", max_brightness_str);
                 return 0;
         }
 
@@ -225,19 +225,26 @@ static unsigned get_max_brightness(struct udev_device *device) {
 
 /* Some systems turn the backlight all the way off at the lowest levels.
  * clamp_brightness clamps the saved brightness to at least 1 or 5% of
- * max_brightness.  This avoids preserving an unreadably dim screen, which
- * would otherwise force the user to disable state restoration. */
+ * max_brightness in case of 'backlight' subsystem. This avoids preserving
+ * an unreadably dim screen, which 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, min_brightness;
+        const char *subsystem;
 
         r = safe_atou(*value, &brightness);
         if (r < 0) {
-                log_warning("Failed to parse brightness \"%s\": %s", *value, strerror(-r));
+                log_warning_errno(r, "Failed to parse brightness \"%s\": %m", *value);
                 return;
         }
 
-        min_brightness = MAX(1U, max_brightness/20);
+        subsystem = udev_device_get_subsystem(device);
+        if (streq_ptr(subsystem, "backlight"))
+                min_brightness = MAX(1U, max_brightness/20);
+        else
+                min_brightness = 0;
+
         new_brightness = CLAMP(brightness, min_brightness, max_brightness);
         if (new_brightness != brightness) {
                 char *old_value = *value;
@@ -278,8 +285,7 @@ int main(int argc, char *argv[]) {
 
         r = mkdir_p("/var/lib/systemd/backlight", 0755);
         if (r < 0) {
-                log_error("Failed to create backlight directory /var/lib/systemd/backlight: %s",
-                          strerror(-r));
+                log_error_errno(r, "Failed to create backlight directory /var/lib/systemd/backlight: %m");
                 return EXIT_FAILURE;
         }
 
@@ -312,7 +318,7 @@ int main(int argc, char *argv[]) {
         device = udev_device_new_from_subsystem_sysname(udev, ss, sysname);
         if (!device) {
                 if (errno != 0)
-                        log_error("Failed to get backlight or LED device '%s:%s': %m", ss, sysname);
+                        log_error_errno(errno, "Failed to get backlight or LED device '%s:%s': %m", ss, sysname);
                 else
                         log_oom();
 
@@ -365,9 +371,12 @@ int main(int argc, char *argv[]) {
          * device probing should be complete), so that the validity
          * check at boot time doesn't have to be reliable. */
 
-        if (streq(argv[1], "load") && shall_restore_state()) {
+        if (streq(argv[1], "load")) {
                 _cleanup_free_ char *value = NULL;
 
+                if (!shall_restore_state())
+                        return EXIT_SUCCESS;
+
                 if (!validate_device(udev, device))
                         return EXIT_SUCCESS;
 
@@ -377,7 +386,7 @@ int main(int argc, char *argv[]) {
                         if (r == -ENOENT)
                                 return EXIT_SUCCESS;
 
-                        log_error("Failed to read %s: %s", saved, strerror(-r));
+                        log_error_errno(r, "Failed to read %s: %m", saved);
                         return EXIT_FAILURE;
                 }
 
@@ -385,8 +394,7 @@ int main(int argc, char *argv[]) {
 
                 r = udev_device_set_sysattr_value(device, "brightness", value);
                 if (r < 0) {
-                        log_error("Failed to write system 'brightness' attribute: %s",
-                                  strerror(-r));
+                        log_error_errno(r, "Failed to write system 'brightness' attribute: %m");
                         return EXIT_FAILURE;
                 }
 
@@ -406,7 +414,7 @@ int main(int argc, char *argv[]) {
 
                 r = write_string_file(saved, value);
                 if (r < 0) {
-                        log_error("Failed to write %s: %s", saved, strerror(-r));
+                        log_error_errno(r, "Failed to write %s: %m", saved);
                         return EXIT_FAILURE;
                 }