Skip to content

Commit

Permalink
video: don't use flush_scheduled_work() in fb_defio
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tejun Heo authored and Paul Mundt committed Jun 16, 2011
1 parent 1630d85 commit 181b74e
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/video/fb_defio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 181b74e

Please sign in to comment.