diff options
Diffstat (limited to 'kernel/kthread.c')
| -rw-r--r-- | kernel/kthread.c | 3 | 
1 files changed, 2 insertions, 1 deletions
| diff --git a/kernel/kthread.c b/kernel/kthread.c index e29773c82b70..933a625621b8 100644 --- a/kernel/kthread.c +++ b/kernel/kthread.c @@ -897,7 +897,8 @@ void kthread_delayed_work_timer_fn(struct timer_list *t)  	/* Move the work from worker->delayed_work_list. */  	WARN_ON_ONCE(list_empty(&work->node));  	list_del_init(&work->node); -	kthread_insert_work(worker, work, &worker->work_list); +	if (!work->canceling) +		kthread_insert_work(worker, work, &worker->work_list);  	raw_spin_unlock_irqrestore(&worker->lock, flags);  } |