diff options
author | Tejun Heo <tj@kernel.org> | 2011-06-15 10:57:21 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-16 02:36:52 -0400 |
commit | 181b74ef794e198df36fbc8c962126a11a01d395 (patch) | |
tree | 32b175cb80e52a86165846577fbd127e4518ce05 /drivers/video/fb_defio.c | |
parent | 1630d85a831273868651d46d74f069e0cdf9b698 (diff) |
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>
Diffstat (limited to 'drivers/video/fb_defio.c')
-rw-r--r-- | drivers/video/fb_defio.c | 3 |
1 files changed, 1 insertions, 2 deletions
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) | |||
216 | int i; | 216 | int i; |
217 | 217 | ||
218 | BUG_ON(!fbdefio); | 218 | BUG_ON(!fbdefio); |
219 | cancel_delayed_work(&info->deferred_work); | 219 | cancel_delayed_work_sync(&info->deferred_work); |
220 | flush_scheduled_work(); | ||
221 | 220 | ||
222 | /* clear out the mapping that we setup */ | 221 | /* clear out the mapping that we setup */ |
223 | for (i = 0 ; i < info->fix.smem_len; i += PAGE_SIZE) { | 222 | for (i = 0 ; i < info->fix.smem_len; i += PAGE_SIZE) { |