1 files changed, 12 insertions, 10 deletions

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index cfd9dce1ce0b..2ac32e6b5953 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -46,6 +46,17 @@
 struct fb_info *registered_fb[FB_MAX] __read_mostly;
 int num_registered_fb __read_mostly;
 
+int lock_fb_info(struct fb_info *info)
+{
+        mutex_lock(&info->lock);
+        if (!info->fbops) {
+                mutex_unlock(&info->lock);
+                return 0;
+        }
+        return 1;
+}
+EXPORT_SYMBOL(lock_fb_info);
+
 /*
  * Helpers
  */
@@ -1086,13 +1097,8 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
                         return -EINVAL;
                 con2fb.framebuffer = -1;
                 event.data = &con2fb;
-
-                if (!lock_fb_info(info))
-                        return -ENODEV;
                 event.info = info;
                 fb_notifier_call_chain(FB_EVENT_GET_CONSOLE_MAP, &event);
-                unlock_fb_info(info);
-
                 ret = copy_to_user(argp, &con2fb, sizeof(con2fb)) ? -EFAULT : 0;
                 break;
         case FBIOPUT_CON2FBMAP:
@@ -1109,12 +1115,8 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
                         break;
                 }
                 event.data = &con2fb;
-                if (!lock_fb_info(info))
-                        return -ENODEV;
                 event.info = info;
-                ret = fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP,
-                                              &event);
-                unlock_fb_info(info);
+                ret = fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP, &event);
                 break;
         case FBIOBLANK:
                 if (!lock_fb_info(info))