---

yaml --- r: 120158 b: refs/heads/master c: 87884bd h: refs/heads/master v: v3
git-mirror · Dec 22, 2008 · 9aa16d9 · 9aa16d9
1 parent 8d53d38
commit 9aa16d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0790555437df2b6070af8f021b8d2ef79e70e144
+refs/heads/master: 87884bd8ae42c875adbd62c84f47ed1cbb3e5090
diff --git a/trunk/drivers/video/fb_defio.c b/trunk/drivers/video/fb_defio.c
@@ -60,6 +60,10 @@ int fb_deferred_io_fsync(struct file *file, struct dentry *dentry, int datasync)
 {
 	struct fb_info *info = file->private_data;
 
+	/* Skip if deferred io is complied-in but disabled on this fbdev */
+	if (!info->fbdefio)
+		return 0;
+
 	/* Kill off the delayed work */
 	cancel_rearming_delayed_work(&info->deferred_work);