X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbacklight%2Fbacklight.c;h=86f10cc0cf290f15dc5978a74e8a3b9d9f04add3;hb=39883f622f392d8579f4428fc5a789a102efbb10;hp=e8cdad61edad67b2b34aab8d82d10f4f11879f94;hpb=be3f52f4ed02a9256b1577719677b32a17b525ac;p=elogind.git

diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index e8cdad61e..86f10cc0c 100644
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -64,7 +64,7 @@ static struct udev_device *find_pci_or_platform_parent(struct udev_device *devic
 
                 value = udev_device_get_sysattr_value(parent, "class");
                 if (value) {
-                        unsigned long class;
+                        unsigned long class = 0;
 
                         if (safe_atolu(value, &class) < 0) {
                                 log_warning("Cannot parse PCI class %s of device %s:%s.", value, subsystem, sysname);
@@ -285,12 +285,12 @@ int main(int argc, char *argv[]) {
          * their probing at boot-time might happen in any order. This
          * means the validity checking of the device then is not
          * reliable, since it might not see other devices conflicting
-         * with a specific backlight. To deal with this we will
+         * with a specific backlight. To deal with this, we will
          * actively delete backlight state files at shutdown (where
          * device probing should be complete), so that the validity
          * check at boot time doesn't have to be reliable. */
 
-        if (streq(argv[1], "load")) {
+        if (streq(argv[1], "load") && shall_restore_state()) {
                 _cleanup_free_ char *value = NULL;
 
                 if (!validate_device(udev, device))