From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 10 Jun 2020 14:40:52 +0000 (+0200)
Subject: sleep-config: return correct error code
X-Git-Tag: v246-rc1~163^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f9120ad6181fcd7316f5963557cd8d84a5979c8;p=thirdparty%2Fsystemd.git

sleep-config: return correct error code
---

diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index 0e6fd41dcef..616bd66c1b4 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -133,9 +133,9 @@ int can_sleep_state(char **types) {
 }
 
 int can_sleep_disk(char **types) {
+        _cleanup_free_ char *p = NULL;
         char **type;
         int r;
-        _cleanup_free_ char *p = NULL;
 
         if (strv_isempty(types))
                 return true;
@@ -203,16 +203,17 @@ static int swap_device_to_device_id(const SwapEntry *swap, dev_t *ret_dev) {
 
         r = stat(swap->device, &sb);
         if (r < 0)
-                return r;
+                return -errno;
 
         if (streq(swap->type, "partition")) {
                 if (!S_ISBLK(sb.st_mode))
                         return -ENOTBLK;
+
                 *ret_dev = sb.st_rdev;
                 return 0;
+        }
 
-        } else
-                return get_block_device(swap->device, ret_dev);
+        return get_block_device(swap->device, ret_dev);
 }
 
 /*