From a559f9cb379da69730cb32ddc0749736d4759753 Mon Sep 17 00:00:00 2001
From: Thomas Koeller <thomas@koeller.dyndns.org>
Date: Mon, 9 Jan 2006 20:53:48 -0800
Subject: [PATCH] --- yaml --- r: 17665 b: refs/heads/master c:
 cae8a12f49972f040bae6707b7707cd93fe9c9ab h: refs/heads/master i:   17663:
 5ac8c4bbdbc0f3df03a5ca909dd83dfe84301b45 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/fbmem.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e5038427aad0..f3f5261b7479 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74b4f04231b9755106d803ef73b11c3cf6978bcd
+refs/heads/master: cae8a12f49972f040bae6707b7707cd93fe9c9ab
diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c
index 83e259413115..32a9b69becc5 100644
--- a/trunk/drivers/video/fbmem.c
+++ b/trunk/drivers/video/fbmem.c
@@ -1234,6 +1234,7 @@ fb_open(struct inode *inode, struct file *file)
 		return -ENODEV;
 	if (!try_module_get(info->fbops->owner))
 		return -ENODEV;
+	file->private_data = info;
 	if (info->fbops->fb_open) {
 		res = info->fbops->fb_open(info,1);
 		if (res)
@@ -1245,11 +1246,9 @@ fb_open(struct inode *inode, struct file *file)
 static int 
 fb_release(struct inode *inode, struct file *file)
 {
-	int fbidx = iminor(inode);
-	struct fb_info *info;
+	struct fb_info * const info = file->private_data;
 
 	lock_kernel();
-	info = registered_fb[fbidx];
 	if (info->fbops->fb_release)
 		info->fbops->fb_release(info,1);
 	module_put(info->fbops->owner);