From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 25 Sep 2020 14:48:07 +0000 (+0200)
Subject: udev-util: simplify device_is_renaming() error handling
X-Git-Tag: v247-rc1~158^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b9daaedbb9e725a4864056ff3950265f98ac821d;p=thirdparty%2Fsystemd.git

udev-util: simplify device_is_renaming() error handling
---

diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c
index 8b27a6d0d03..31fbfac9cf0 100644
--- a/src/shared/udev-util.c
+++ b/src/shared/udev-util.c
@@ -288,10 +288,12 @@ int device_is_renaming(sd_device *dev) {
         assert(dev);
 
         r = sd_device_get_property_value(dev, "ID_RENAMING", NULL);
-        if (r < 0 && r != -ENOENT)
+        if (r == -ENOENT)
+                return false;
+        if (r < 0)
                 return r;
 
-        return r >= 0;
+        return true;
 }
 
 bool device_for_action(sd_device *dev, DeviceAction action) {