1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 070b9a13d892..dc61c12ecf8c 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1177,8 +1177,10 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
                 event.data = &con2fb;
                 if (!lock_fb_info(info))
                         return -ENODEV;
+                console_lock();
                 event.info = info;
                 ret = fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP, &event);
+                console_unlock();
                 unlock_fb_info(info);
                 break;
         case FBIOBLANK: