From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
Date: Mon, 27 May 2024 15:17:52 +0000 (+0200)
Subject: udev-spawn: fix typo and simplify code
X-Git-Tag: v257-rc1~1103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdd4263cac327a3bc447560dbd46713524046099;p=thirdparty%2Fsystemd.git

udev-spawn: fix typo and simplify code

Follow-up for 11706971e8b6aa289af56454330fffd87f5d5a78
---

diff --git a/src/udev/udev-spawn.c b/src/udev/udev-spawn.c
index 3f867a8eb2e..d2a422f7e8c 100644
--- a/src/udev/udev-spawn.c
+++ b/src/udev/udev-spawn.c
@@ -349,13 +349,12 @@ void udev_event_execute_run(UdevEvent *event) {
                                 log_device_debug_errno(event->dev, r, "Failed to run built-in command \"%s\", ignoring: %m", command);
                 } else {
                         if (event->worker && event->worker->exec_delay_usec > 0) {
-                                usec_t timeout_usec = event->worker ? event->worker->timeout_usec : DEFAULT_WORKER_TIMEOUT_USEC;
                                 usec_t now_usec = now(CLOCK_MONOTONIC);
                                 usec_t age_usec = usec_sub_unsigned(now_usec, event->birth_usec);
 
-                                if (event->worker->exec_delay_usec >= usec_sub_unsigned(timeout_usec, age_usec)) {
+                                if (event->worker->exec_delay_usec >= usec_sub_unsigned(event->worker->timeout_usec, age_usec)) {
                                         log_device_warning(event->dev,
-                                                           "Cannot delaying execution of \"%s\" for %s, skipping.",
+                                                           "Cannot delay execution of \"%s\" for %s, skipping.",
                                                            command, FORMAT_TIMESPAN(event->worker->exec_delay_usec, USEC_PER_SEC));
                                         continue;
                                 }