diff --git a/kernel/timeout.c b/kernel/timeout.c index f751c2f20a5..c18f2e41d06 100644 --- a/kernel/timeout.c +++ b/kernel/timeout.c @@ -147,8 +147,13 @@ int z_abort_timeout(struct _timeout *to) K_SPINLOCK(&timeout_lock) { if (sys_dnode_is_linked(&to->node)) { + bool is_first = (to == first()); + remove_timeout(to); ret = 0; + if (is_first) { + sys_clock_set_timeout(next_timeout(), false); + } } }