fbcon: use lock_fb_info in fbcon_open/release

[platform/kernel/linux-starfive.git] / drivers / video / fbdev / core / fbcon.c

diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index f0213a0..cc960bf 100644 (file)
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -684,8 +684,10 @@ static int fbcon_invalid_charcount(struct fb_info *info, unsigned charcount)
 
 static void fbcon_release(struct fb_info *info)
 {
+       lock_fb_info(info);
        if (info->fbops->fb_release)
                info->fbops->fb_release(info, 0);
+       unlock_fb_info(info);
 
        module_put(info->fbops->owner);
 }
@@ -697,11 +699,14 @@ static int fbcon_open(struct fb_info *info)
        if (!try_module_get(info->fbops->owner))
                return -ENODEV;
 
+       lock_fb_info(info);
        if (info->fbops->fb_open &&
            info->fbops->fb_open(info, 0)) {
+               unlock_fb_info(info);
                module_put(info->fbops->owner);
                return -ENODEV;
        }
+       unlock_fb_info(info);
 
        ops = kzalloc(sizeof(struct fbcon_ops), GFP_KERNEL);
        if (!ops) {