1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 67ff370d80af..0b2adefe9e3d 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -3531,12 +3531,18 @@ static void fbcon_exit(void)
         softback_buf = 0UL;
 
         for (i = 0; i < FB_MAX; i++) {
+                int pending;
+
                 mapped = 0;
                 info = registered_fb[i];
 
                 if (info == NULL)
                         continue;
 
+                pending = cancel_work_sync(&info->queue);
+                DPRINTK("fbcon: %s pending work\n", (pending ? "canceled" :
+                        "no"));
+
                 for (j = first_fb_vc; j <= last_fb_vc; j++) {
                         if (con2fb_map[j] == i)
                                 mapped = 1;