diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 03:50:42 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 03:50:42 +0000 |
commit | 78e9bb837c258ac0ec7712b3d612cc2f407e731e (patch) | |
tree | f515d16b6efd858a9aeb5b0ef5d6f90bf288283d /src/udev/udev-watch.c | |
parent | Adding debian version 255.5-1. (diff) | |
download | systemd-78e9bb837c258ac0ec7712b3d612cc2f407e731e.tar.xz systemd-78e9bb837c258ac0ec7712b3d612cc2f407e731e.zip |
Merging upstream version 256.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/udev/udev-watch.c')
-rw-r--r-- | src/udev/udev-watch.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c index 58c8279..258eb26 100644 --- a/src/udev/udev-watch.c +++ b/src/udev/udev-watch.c @@ -232,12 +232,9 @@ int udev_watch_end(int inotify_fd, sd_device *dev) { _cleanup_close_ int dirfd = -EBADF; int wd, r; + assert(inotify_fd >= 0); assert(dev); - /* This may be called by 'udevadm test'. In that case, inotify_fd is not initialized. */ - if (inotify_fd < 0) - return 0; - if (sd_device_get_devname(dev, NULL) < 0) return 0; |