From b7759e040339f8adfd8c6184e16b8b7e14fbfd7f Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 27 Oct 2018 08:06:40 +0900
Subject: [PATCH] udev: drop redundant log message and fix returned error code

---
 src/udev/udev-watch.c | 2 +-
 src/udev/udevd.c      | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c
index 4924b75c50..1d3d9f1c08 100644
--- a/src/udev/udev-watch.c
+++ b/src/udev/udev-watch.c
@@ -24,7 +24,7 @@ static int inotify_fd = -1;
 int udev_watch_init(void) {
         inotify_fd = inotify_init1(IN_CLOEXEC);
         if (inotify_fd < 0)
-                return log_error_errno(errno, "Failed to create inotify descriptor: %m");
+                return -errno;
 
         return inotify_fd;
 }
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 7ec30b92c3..42c8878186 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1578,9 +1578,10 @@ static int manager_new(Manager **ret, int fd_ctrl, int fd_uevent, const char *cg
         if (r < 0)
                 return log_error_errno(r, "could not enable SO_PASSCRED: %m");
 
-        manager->fd_inotify = udev_watch_init();
-        if (manager->fd_inotify < 0)
-                return log_error_errno(ENOMEM, "error initializing inotify");
+        r = udev_watch_init();
+        if (r < 0)
+                return log_error_errno(r, "Failed to create inotify descriptor: %m");
+        manager->fd_inotify = r;
 
         udev_watch_restore();