summaryrefslogtreecommitdiff
path: root/udev
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2011-05-18 19:05:06 +0200
committerKay Sievers <kay.sievers@vrfy.org>2011-05-18 19:05:06 +0200
commit2661ff211706bc689617924e446a0d4c3f210da9 (patch)
tree2dbbc2e465035a85c9a13ffc604c12e9649d2201 /udev
parentbd8e0e387d844bd5b7d8c29ca2871c824c0fc146 (diff)
release 169
Diffstat (limited to 'udev')
-rw-r--r--udev/udevadm-settle.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c
index 053a3bba33..b17ba806d0 100644
--- a/udev/udevadm-settle.c
+++ b/udev/udevadm-settle.c
@@ -185,12 +185,11 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
if (pfd[0].fd >= 0) {
int delay;
- /* wake up after delay, or immediately after the queue is rebuilt */
-
if (exists != NULL || start > 0)
delay = 100;
else
delay = 1000;
+ /* wake up after delay, or immediately after the queue is rebuilt */
if (poll(pfd, 1, delay) > 0 && pfd[0].revents & POLLIN) {
char buf[sizeof(struct inotify_event) + PATH_MAX];