From 142092e577255e33a4ab74c6baad04c9fb887927 Mon Sep 17 00:00:00 2001 From: Jarek Poplawski Date: Wed, 22 Sep 2010 13:05:05 -0700 Subject: fbcon: fix lockdep warning from fbcon_deinit() Fix the lockdep warning: [ 13.657164] INFO: trying to register non-static key. [ 13.657169] the code is fine but needs lockdep annotation. [ 13.657171] turning off the locking correctness validator. [ 13.657177] Pid: 622, comm: modprobe Not tainted 2.6.36-rc3c #8 [ 13.657180] Call Trace: [ 13.657194] [] ? printk+0x18/0x20 [ 13.657202] [] register_lock_class+0x336/0x350 [ 13.657208] [] __lock_acquire+0x449/0x1180 [ 13.657215] [] lock_acquire+0x67/0x80 [ 13.657222] [] ? __cancel_work_timer+0x51/0x230 [ 13.657227] [] __cancel_work_timer+0x83/0x230 [ 13.657231] [] ? __cancel_work_timer+0x51/0x230 [ 13.657236] [] ? mark_held_locks+0x62/0x80 [ 13.657243] [] ? kfree+0x7f/0xe0 [ 13.657248] [] ? trace_hardirqs_on_caller+0x11c/0x160 [ 13.657253] [] ? trace_hardirqs_on+0xb/0x10 [ 13.657259] [] ? fbcon_deinit+0x16d/0x1e0 [ 13.657263] [] ? fbcon_deinit+0x16d/0x1e0 [ 13.657268] [] cancel_work_sync+0xa/0x10 [ 13.657272] [] fbcon_deinit+0xe4/0x1e0 ... The warning is caused by trying to cancel an uninitialized work from fbcon_exit(). Fix it by adding a check for queue.func, similarly to other places in this code. Signed-off-by: Jarek Poplawski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/video/console/fbcon.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 84f842331dfa..7ccc967831f0 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -3508,7 +3508,7 @@ static void fbcon_exit(void) softback_buf = 0UL; for (i = 0; i < FB_MAX; i++) { - int pending; + int pending = 0; mapped = 0; info = registered_fb[i]; @@ -3516,7 +3516,8 @@ static void fbcon_exit(void) if (info == NULL) continue; - pending = cancel_work_sync(&info->queue); + if (info->queue.func) + pending = cancel_work_sync(&info->queue); DPRINTK("fbcon: %s pending work\n", (pending ? "canceled" : "no")); -- cgit v1.2.3