From: Tejun Heo <tj@kernel.org>
Date: Wed, 15 Jun 2011 14:57:21 +0000 (+0200)
Subject: video: don't use flush_scheduled_work() in fb_defio
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=181b74ef794e198df36fbc8c962126a11a01d395;p=linux-beck.git

video: don't use flush_scheduled_work() in fb_defio

flush_scheduled_work() in on the way out.  fb_deferred_io_cleanup()
can simply sync-cancel info->deferred_work instead of cancel +
flush_scheduled_work().  Drop flush_scheduled_work() usage.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jaya Kumar <jayalk@intworks.biz>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
index 804000183c5e..a79c0dedfbd4 100644
--- a/drivers/video/fb_defio.c
+++ b/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) {