diff options
author | Tejun Heo <tj@kernel.org> | 2010-12-24 09:59:07 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2010-12-24 09:59:07 -0500 |
commit | a6665944ef83b6a2db8fc5b323c9fca92375a643 (patch) | |
tree | 9fbdefe5e8d078fc17070a3b7b605f2c4f510edf | |
parent | 2e5c44c92046c41607794666ffc0d6945945acb0 (diff) |
vmwgfx: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush info->deferred_work on removal instead.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c index 41d9a5b73c03..fe096a7cc0d7 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | |||
@@ -659,7 +659,7 @@ int vmw_fb_off(struct vmw_private *vmw_priv) | |||
659 | par->dirty.active = false; | 659 | par->dirty.active = false; |
660 | spin_unlock_irqrestore(&par->dirty.lock, flags); | 660 | spin_unlock_irqrestore(&par->dirty.lock, flags); |
661 | 661 | ||
662 | flush_scheduled_work(); | 662 | flush_delayed_work_sync(&info->deferred_work); |
663 | 663 | ||
664 | par->bo_ptr = NULL; | 664 | par->bo_ptr = NULL; |
665 | ttm_bo_kunmap(&par->map); | 665 | ttm_bo_kunmap(&par->map); |