]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-device: use right clock when comparing initialization usec
authorLennart Poettering <lennart@poettering.net>
Tue, 20 Apr 2021 13:56:03 +0000 (15:56 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 20 Apr 2021 15:12:39 +0000 (17:12 +0200)
we actually use CLOCK_MONOTONIC for the timestamp, hence when
comparing/subtracting it from the current time, also use
CLOCK_MONOTONIC.

src/libsystemd/sd-device/sd-device.c

index 927a4f1d522e568081c3ff23933d74350bbdedc7..200e2077ee689f8185b6714a25cc032c200e6d59 100644 (file)
@@ -1441,10 +1441,10 @@ _public_ int sd_device_get_usec_since_initialized(sd_device *device, uint64_t *u
         if (!device->is_initialized)
                 return -EBUSY;
 
-        if (!device->usec_initialized)
+        if (device->usec_initialized == 0)
                 return -ENODATA;
 
-        now_ts = now(clock_boottime_or_monotonic());
+        now_ts = now(CLOCK_MONOTONIC);
 
         if (now_ts < device->usec_initialized)
                 return -EIO;