3 files changed, 51 insertions, 28 deletions

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index dacaf74256a3..010d19105ebc 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1108,14 +1108,16 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
         case FBIOPUT_VSCREENINFO:
                 if (copy_from_user(&var, argp, sizeof(var)))
                         return -EFAULT;
-                if (!lock_fb_info(info))
-                        return -ENODEV;
                 console_lock();
+                if (!lock_fb_info(info)) {
+                        console_unlock();
+                        return -ENODEV;
+                }
                 info->flags |= FBINFO_MISC_USEREVENT;
                 ret = fb_set_var(info, &var);
                 info->flags &= ~FBINFO_MISC_USEREVENT;
-                console_unlock();
                 unlock_fb_info(info);
+                console_unlock();
                 if (!ret && copy_to_user(argp, &var, sizeof(var)))
                         ret = -EFAULT;
                 break;
@@ -1144,12 +1146,14 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
         case FBIOPAN_DISPLAY:
                 if (copy_from_user(&var, argp, sizeof(var)))
                         return -EFAULT;
-                if (!lock_fb_info(info))
-                        return -ENODEV;
                 console_lock();
+                if (!lock_fb_info(info)) {
+                        console_unlock();
+                        return -ENODEV;
+                }
                 ret = fb_pan_display(info, &var);
-                console_unlock();
                 unlock_fb_info(info);
+                console_unlock();
                 if (ret == 0 && copy_to_user(argp, &var, sizeof(var)))
                         return -EFAULT;
                 break;
@@ -1184,23 +1188,27 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
                         break;
                 }
                 event.data = &con2fb;
-                if (!lock_fb_info(info))
-                        return -ENODEV;
                 console_lock();
+                if (!lock_fb_info(info)) {
+                        console_unlock();
+                        return -ENODEV;
+                }
                 event.info = info;
                 ret = fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP, &event);
-                console_unlock();
                 unlock_fb_info(info);
+                console_unlock();
                 break;
         case FBIOBLANK:
-                if (!lock_fb_info(info))
-                        return -ENODEV;
                 console_lock();
+                if (!lock_fb_info(info)) {
+                        console_unlock();
+                        return -ENODEV;
+                }
                 info->flags |= FBINFO_MISC_USEREVENT;
                 ret = fb_blank(info, arg);
                 info->flags &= ~FBINFO_MISC_USEREVENT;
-                console_unlock();
                 unlock_fb_info(info);
+                console_unlock();
                 break;
         default:
                 if (!lock_fb_info(info))
@@ -1660,12 +1668,15 @@ static int do_register_framebuffer(struct fb_info *fb_info)
         registered_fb[i] = fb_info;
 
         event.info = fb_info;
-        if (!lock_fb_info(fb_info))
-                return -ENODEV;
         console_lock();
+        if (!lock_fb_info(fb_info)) {
+                console_unlock();
+                return -ENODEV;
+        }
+
         fb_notifier_call_chain(FB_EVENT_FB_REGISTERED, &event);
-        console_unlock();
         unlock_fb_info(fb_info);
+        console_unlock();
         return 0;
 }
 
@@ -1678,13 +1689,16 @@ static int do_unregister_framebuffer(struct fb_info *fb_info)
         if (i < 0 || i >= FB_MAX || registered_fb[i] != fb_info)
                 return -EINVAL;
 
-        if (!lock_fb_info(fb_info))
-                return -ENODEV;
         console_lock();
+        if (!lock_fb_info(fb_info)) {
+                console_unlock();
+                return -ENODEV;
+        }
+
         event.info = fb_info;
         ret = fb_notifier_call_chain(FB_EVENT_FB_UNBIND, &event);
-        console_unlock();
         unlock_fb_info(fb_info);
+        console_unlock();
 
         if (ret)
                 return -EINVAL;
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
index ef476b02fbe5..53444ac19fe0 100644
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
@@ -177,9 +177,12 @@ static ssize_t store_modes(struct device *device,
         if (i * sizeof(struct fb_videomode) != count)
                 return -EINVAL;
 
-        if (!lock_fb_info(fb_info))
-                return -ENODEV;
         console_lock();
+        if (!lock_fb_info(fb_info)) {
+                console_unlock();
+                return -ENODEV;
+        }
+
         list_splice(&fb_info->modelist, &old_list);
         fb_videomode_to_modelist((const struct fb_videomode *)buf, i,
                                  &fb_info->modelist);
@@ -189,8 +192,8 @@ static ssize_t store_modes(struct device *device,
         } else
                 fb_destroy_modelist(&old_list);
 
-        console_unlock();
         unlock_fb_info(fb_info);
+        console_unlock();
 
         return 0;
 }
@@ -404,12 +407,16 @@ static ssize_t store_fbstate(struct device *device,
 
         state = simple_strtoul(buf, &last, 0);
 
-        if (!lock_fb_info(fb_info))
-                return -ENODEV;
         console_lock();
+        if (!lock_fb_info(fb_info)) {
+                console_unlock();
+                return -ENODEV;
+        }
+
         fb_set_suspend(fb_info, (int)state);
-        console_unlock();
+
         unlock_fb_info(fb_info);
+        console_unlock();
 
         return count;
 }
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index eaeae0fd0962..ab85ad6c25ec 100644
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -574,8 +574,9 @@ static int sh_mobile_lcdc_display_notify(struct sh_mobile_lcdc_chan *ch,
         switch (event) {
         case SH_MOBILE_LCDC_EVENT_DISPLAY_CONNECT:
                 /* HDMI plug in */
+                console_lock();
                 if (lock_fb_info(info)) {
-                        console_lock();
+
 
                         ch->display.width = monspec->max_x * 10;
                         ch->display.height = monspec->max_y * 10;
@@ -594,19 +595,20 @@ static int sh_mobile_lcdc_display_notify(struct sh_mobile_lcdc_chan *ch,
                                 fb_set_suspend(info, 0);
                         }
 
-                        console_unlock();
+
                         unlock_fb_info(info);
                 }
+                console_unlock();
                 break;
 
         case SH_MOBILE_LCDC_EVENT_DISPLAY_DISCONNECT:
                 /* HDMI disconnect */
+                console_lock();
                 if (lock_fb_info(info)) {
-                        console_lock();
                         fb_set_suspend(info, 1);
-                        console_unlock();
                         unlock_fb_info(info);
                 }
+                console_unlock();
                 break;
 
         case SH_MOBILE_LCDC_EVENT_DISPLAY_MODE: