X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=kernel%2Fworkqueue.c;h=a503ad9d0aec849e3bb1929b389eab3abb4236ad;hb=4d43d395fed124631ca02356c711facb90185175;hp=392be4b252f69d02f5cd1770c17344b8067aec2f;hpb=c7eaf342ecb164d79275a6c1c93aef19293a4aaf;p=linux-2.6-microblaze.git

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 392be4b252f6..a503ad9d0aec 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -2908,6 +2908,9 @@ static bool __flush_work(struct work_struct *work, bool from_cancel)
 	if (WARN_ON(!wq_online))
 		return false;
 
+	if (WARN_ON(!work->func))
+		return false;
+
 	if (!from_cancel) {
 		lock_map_acquire(&work->lockdep_map);
 		lock_map_release(&work->lockdep_map);