From 1b1b383772e1a8d414374371fd3c4f3a84dd0a9f Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Wed, 15 Jun 2011 16:57:21 +0200
Subject: [PATCH] --- yaml --- r: 271261 b: refs/heads/master c:
 181b74ef794e198df36fbc8c962126a11a01d395 h: refs/heads/master i:   271259:
 d9b79c698729d1e96f5cfcc2592e8d769f822570 v: v3

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

diff --git a/[refs] b/[refs]
index 45e50793daf1..2dd067bb9e64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1630d85a831273868651d46d74f069e0cdf9b698
+refs/heads/master: 181b74ef794e198df36fbc8c962126a11a01d395
diff --git a/trunk/drivers/video/fb_defio.c b/trunk/drivers/video/fb_defio.c
index 804000183c5e..a79c0dedfbd4 100644
--- a/trunk/drivers/video/fb_defio.c
+++ b/trunk/drivers/video/fb_defio.c
@@ -216,8 +216,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
 	int i;
 
 	BUG_ON(!fbdefio);
-	cancel_delayed_work(&info->deferred_work);
-	flush_scheduled_work();
+	cancel_delayed_work_sync(&info->deferred_work);
 
 	/* clear out the mapping that we setup */
 	for (i = 0 ; i < info->fix.smem_len; i += PAGE_SIZE) {