From 181b74ef794e198df36fbc8c962126a11a01d395 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Wed, 15 Jun 2011 16:57:21 +0200 Subject: 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 Cc: Jaya Kumar Signed-off-by: Paul Mundt --- drivers/video/fb_defio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers/video/fb_defio.c') diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c index 804000183c5..a79c0dedfbd 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) { -- cgit v1.2.3-70-g09d2