From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 2 Mar 2021 08:17:16 +0000 (+0900)
Subject: libudev: shorten code a bit
X-Git-Tag: v248-rc3~65^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d61d70abb7bfef15d8aca140468c95388a42b6b;p=thirdparty%2Fsystemd.git

libudev: shorten code a bit

fd_wait_for_event() or ppoll() does not return -EAGAIN.
---

diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c
index a93adbd7a2e..4ddcf95d05f 100644
--- a/src/libudev/libudev-monitor.c
+++ b/src/libudev/libudev-monitor.c
@@ -206,12 +206,10 @@ static int udev_monitor_receive_sd_device(struct udev_monitor *udev_monitor, sd_
                 for (;;) {
                         /* Wait for next message */
                         r = fd_wait_for_event(device_monitor_get_fd(udev_monitor->monitor), POLLIN, 0);
-                        if (r < 0) {
-                                if (IN_SET(r, -EINTR, -EAGAIN))
-                                        continue;
-
+                        if (r == -EINTR)
+                                continue;
+                        if (r < 0)
                                 return r;
-                        }
                         if (r == 0)
                                 return -EAGAIN;