git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
vgacon.c: add cond reschedule points in vgacon_do_font_op
[pandora-kernel.git]
/
drivers
/
video
/
fb_defio.c
diff --git
a/drivers/video/fb_defio.c
b/drivers/video/fb_defio.c
index
32814e8
..
c27e153
100644
(file)
--- a/
drivers/video/fb_defio.c
+++ b/
drivers/video/fb_defio.c
@@
-223,8
+223,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) {