diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2026-02-14 13:06:51 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2026-02-14 13:06:51 -0800 |
| commit | 273a171dee33cb77070d7259c469d9440548c7df (patch) | |
| tree | d82dffe3e4affbce24e05db216d9450743aae625 /kernel/time/timer.c | |
| parent | 19a5d9ba6208e9006a2a9d5962aea4d6e427d8ab (diff) | |
| parent | ab2e361ca97a42b7af8be1d273646b30d3b75bf3 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 7.0 merge window.
Diffstat (limited to 'kernel/time/timer.c')
| -rw-r--r-- | kernel/time/timer.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 553fa469d7cc..d5ebb1d927ea 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1458,10 +1458,11 @@ static int __try_to_del_timer_sync(struct timer_list *timer, bool shutdown) base = lock_timer_base(timer, &flags); - if (base->running_timer != timer) + if (base->running_timer != timer) { ret = detach_if_pending(timer, base, true); - if (shutdown) - timer->function = NULL; + if (shutdown) + timer->function = NULL; + } raw_spin_unlock_irqrestore(&base->lock, flags); |