Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport v3.7.99-ncs3-branch] [nrf fromtree] kernel: timeout: ensure next timeout is set when abort… #2441

Open
wants to merge 1 commit into
base: v3.7.99-ncs3-branch
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions kernel/timeout.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}

Expand Down
Loading