diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-09-18 01:28:23 +0900 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-09-21 23:03:43 +0200 |
| commit | 7ed7ea82f6a8387893f4741ccaeb0111770854c8 (patch) | |
| tree | 6d8329d0220b51edcff30303686d2b760b5b398e | |
| parent | 477bf86c911a9fdc57341cbf2acf70ae1965edfd (diff) | |
| download | systemd-7ed7ea82f6a8387893f4741ccaeb0111770854c8.tar.gz | |
udevadm: use usec_add()
Also fixes description of event source.
(cherry picked from commit f6e8ba816577a1a26037a8aeae23fda36d74f0ac)
| -rw-r--r-- | src/udev/udev-ctrl.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c index 751e034982..f1befc7304 100644 --- a/src/udev/udev-ctrl.c +++ b/src/udev/udev-ctrl.c @@ -395,14 +395,13 @@ int udev_ctrl_wait(struct udev_ctrl *uctrl, usec_t timeout) { (void) sd_event_source_set_description(source_io, "udev-ctrl-wait-io"); if (timeout != USEC_INFINITY) { - usec_t usec; - - usec = now(clock_boottime_or_monotonic()) + timeout; - r = sd_event_add_time(uctrl->event, &source_timeout, clock_boottime_or_monotonic(), usec, 0, NULL, INT_TO_PTR(-ETIMEDOUT)); + r = sd_event_add_time(uctrl->event, &source_timeout, clock_boottime_or_monotonic(), + usec_add(now(clock_boottime_or_monotonic()), timeout), + 0, NULL, INT_TO_PTR(-ETIMEDOUT)); if (r < 0) return r; - (void) sd_event_source_set_description(source_timeout, "udev-ctrl-wait-io"); + (void) sd_event_source_set_description(source_timeout, "udev-ctrl-wait-timeout"); } return sd_event_loop(uctrl->event); |