From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 22 Oct 2018 03:04:52 +0000 (+0900)
Subject: udev: propagate original error from udev_builtin_add_property()
X-Git-Tag: v240~493^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=269c3b67c626b252763f0fa3228a98003e85d88f;p=thirdparty%2Fsystemd.git

udev: propagate original error from udev_builtin_add_property()
---

diff --git a/src/udev/udev-builtin-hwdb.c b/src/udev/udev-builtin-hwdb.c
index 59ac25110c8..5a905c3b663 100644
--- a/src/udev/udev-builtin-hwdb.c
+++ b/src/udev/udev-builtin-hwdb.c
@@ -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;