---

yaml --- r: 210916 b: refs/heads/master c: 142092e h: refs/heads/master v: v3
git-mirror · Sep 23, 2010 · 7e5c852 · 7e5c852
1 parent 3d4b561
commit 7e5c852
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5757c2a474a15f87e5baa9a4caacc31cde2bae6
+refs/heads/master: 142092e577255e33a4ab74c6baad04c9fb887927
diff --git a/trunk/drivers/video/console/fbcon.c b/trunk/drivers/video/console/fbcon.c
@@ -3508,15 +3508,16 @@ 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];
 
 		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"));