work_q: delayed work cancel returns incorrect status

Mahavir Jain · Anas Nashif · commit 9adaf59d369c · 2016-12-02T12:51:04.000Z
If delayed work is already submitted or completed, then subsequent cancel should return -EINVAL as return status. Fixes ZEP-1373. Change-Id: I16bbacca7e31a5a5d8e5a89e729d70302ada6223 Signed-off-by: Mahavir Jain <mjain@marvell.com> (cherry picked from commit 45f2ef6)
diff --git a/kernel/unified/work_q.c b/kernel/unified/work_q.c
@@ -71,6 +71,8 @@ static void work_timeout(struct _timeout *t)
 
 	/* submit work to workqueue */
 	k_work_submit_to_queue(w->work_q, &w->work);
+	/* detach from workqueue, for cancel to return appropriate status */
+	w->work_q = NULL;
 }
 
 void k_delayed_work_init(struct k_delayed_work *work, k_work_handler_t handler)

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,8 @@ static void work_timeout(struct _timeout *t)`
`71`	`71`
`72`	`72`	`/* submit work to workqueue */`
`73`	`73`	`k_work_submit_to_queue(w->work_q, &w->work);`
	`74`	`+ /* detach from workqueue, for cancel to return appropriate status */`
	`75`	`+ w->work_q = NULL;`
`74`	`76`	`}`
`75`	`77`
`76`	`78`	`void k_delayed_work_init(struct k_delayed_work *work, k_work_handler_t handler)`