From 7e5c852c805fca92400843c1274803a0b821d58b Mon Sep 17 00:00:00 2001
From: Jarek Poplawski <jarkao2@gmail.com>
Date: Wed, 22 Sep 2010 13:05:05 -0700
Subject: [PATCH] --- yaml --- r: 210916 b: refs/heads/master c:
 142092e577255e33a4ab74c6baad04c9fb887927 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/video/console/fbcon.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 34b37aa03d00..65aeb508643f 100644
--- 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
index 84f842331dfa..7ccc967831f0 100644
--- a/trunk/drivers/video/console/fbcon.c
+++ b/trunk/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"));