From 2ee041bbeb8929c41820e767e986427a9d8ac587 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@igel.co.jp>
Date: Fri, 19 Dec 2008 15:34:23 +0900
Subject: [PATCH] --- yaml --- r: 120159 b: refs/heads/master c:
 6e1038a95bebb8a1ad6066c95aa9c3af6963c9ff h: refs/heads/master i:   120157:
 8d53d3860e73048606e06f948fe469bce147c1a3   120155:
 a4ab3669ebdeccfd9c00d68d8ec235985e518d5b   120151:
 58085efd69fe6cf43125d0af874487a86f1e21b9   120143:
 7877cadc5b1f9bb52832dfb2be2f9d1a8c4773d8   120127:
 9072aa218baeb88a3222d1dbf3fb02c5e16a6df2 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/video/fb_defio.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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);