]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
udev: propagate original error from udev_builtin_add_property()
authorYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 22 Oct 2018 03:04:52 +0000 (12:04 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 23 Oct 2018 09:28:38 +0000 (18:28 +0900)
src/udev/udev-builtin-hwdb.c

index 59ac25110c82bad554249b7152f7568a5abc6817..5a905c3b6635b1b97cb8cf2a5f6092dcd89e4532 100644 (file)
@@ -21,7 +21,7 @@ int udev_builtin_hwdb_lookup(sd_device *dev,
                              const char *filter, bool test) {
         _cleanup_free_ char *lookup = NULL;
         const char *key, *value;
-        int n = 0;
+        int n = 0, r;
 
         if (!hwdb)
                 return -ENOENT;
@@ -37,8 +37,9 @@ int udev_builtin_hwdb_lookup(sd_device *dev,
                 if (filter && fnmatch(filter, key, FNM_NOESCAPE) != 0)
                         continue;
 
-                if (udev_builtin_add_property(dev, test, key, value) < 0)
-                        return -ENOMEM;
+                r = udev_builtin_add_property(dev, test, key, value);
+                if (r < 0)
+                        return r;
                 n++;
         }
         return n;