---

yaml --- r: 271261 b: refs/heads/master c: 181b74e h: refs/heads/master i: 271259: d9b79c6 v: v3
git-mirror · Jun 16, 2011 · 1b1b383 · 1b1b383
1 parent 5dec5dd
commit 1b1b383
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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) {