From: Michael Biebl <biebl@debian.org>
Date: Wed, 10 Sep 2014 22:49:36 +0000 (+0200)
Subject: backlight: Avoid error when state restore is disabled
X-Git-Tag: v217~607
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=inline;h=b76388e123e8d73ded1fd53937d816b314948517;p=elogind.git

backlight: Avoid error when state restore is disabled

When the state restore is disabled, we would print:
"Unknown verb: load" instead of simply skipping loading the
state.
---

diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index 4d94ebf58..0a2bac6f1 100644
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -372,9 +372,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;