---

yaml --- r: 17665 b: refs/heads/master c: cae8a12 h: refs/heads/master i: 17663: 5ac8c4b v: v3
git-mirror · Jan 10, 2006 · a559f9c · a559f9c
1 parent d2200ce
commit a559f9c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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);