Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / video / fb_defio.c

diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
index 6b93ef93cb12c08179c973e31bf97ff27eb4d56b..804000183c5e8900e69aa6c1748efa106e312690 100644 (file)
--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
@@ -75,7 +75,7 @@ int fb_deferred_io_fsync(struct file *file, int datasync)
                return 0;
 
        /* Kill off the delayed work */
-       cancel_rearming_delayed_work(&info->deferred_work);
+       cancel_delayed_work_sync(&info->deferred_work);
 
        /* Run it immediately */
        return schedule_delayed_work(&info->deferred_work, 0);