diff --git a/[refs] b/[refs]
index 9294878be72b..0a468b480f2e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87884bd8ae42c875adbd62c84f47ed1cbb3e5090
+refs/heads/master: 6e1038a95bebb8a1ad6066c95aa9c3af6963c9ff
diff --git a/trunk/drivers/video/fb_defio.c b/trunk/drivers/video/fb_defio.c
index e6dafeddfa5b..06060ccd3c23 100644
--- a/trunk/drivers/video/fb_defio.c
+++ b/trunk/drivers/video/fb_defio.c
@@ -202,6 +202,9 @@ void fb_deferred_io_cleanup(struct fb_info *info)
 		page = vmalloc_to_page(screen_base + i);
 		page->mapping = NULL;
 	}
+
+	info->fbops->fb_mmap = NULL;
+	mutex_destroy(&fbdefio->lock);
 }
 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);