[PATCH RESEND] fb_defio: don't use flush_scheduled_work()

[Tejun Heo]

flush_scheduled_work() scheduled for deprecation.  Sync cancel
info->deferred_work directly instead.

Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Jaya Kumar <jayakumar.lkml@xxxxxxxxx>
---
Resent because email address jayalk@xxxxxxxxxxxx from MAINTAINERS
failed.  Jaya, please update the MAINTAINERS entry.  Thank you.

 drivers/video/fb_defio.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: work/drivers/video/fb_defio.c
===================================================================
--- work.orig/drivers/video/fb_defio.c
+++ work/drivers/video/fb_defio.c
@@ -216,8 +216,7 @@ void fb_deferred_io_cleanup(struct fb_in
 	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) {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/