Commit 3647d6d3 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

fbcon: Move more code into fbcon_release 



con2fb_release_oldinfo() has a bunch more kfree() calls than
fbcon_exit(), but since kfree() on NULL is harmless doing that in both
places should be ok. This is also a bit more symmetric now again with
fbcon_open also allocating the fbcon_ops structure.

Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Du Cheng <ducheng2@gmail.com>
Cc: Claudio Suarez <cssk@net-c.es>
Link: https://patchwork.freedesktop.org/patch/msgid/20220405210335.3434130-16-daniel.vetter@ffwll.ch
parent 6e7da3af

drivers/video/fbdev/core/fbcon.c

+13 −20
Original line number Diff line number Diff line
@@ -690,6 +690,18 @@ static void fbcon_release(struct fb_info *info) 
	unlock_fb_info(info);



	module_put(info->fbops->owner);



	if (info->fbcon_par) {

		struct fbcon_ops *ops = info->fbcon_par;



		fbcon_del_cursor_work(info);

		kfree(ops->cursor_state.mask);

		kfree(ops->cursor_data);

		kfree(ops->cursor_src);

		kfree(ops->fontbuffer);

		kfree(info->fbcon_par);

		info->fbcon_par = NULL;

	}

}



static int fbcon_open(struct fb_info *info)
@@ -740,18 +752,10 @@ static int con2fb_acquire_newinfo(struct vc_data *vc, struct fb_info *info, 
static void con2fb_release_oldinfo(struct vc_data *vc, struct fb_info *oldinfo,

				   struct fb_info *newinfo)

{

	struct fbcon_ops *ops = oldinfo->fbcon_par;

	int ret;



	fbcon_release(oldinfo);



	fbcon_del_cursor_work(oldinfo);

	kfree(ops->cursor_state.mask);

	kfree(ops->cursor_data);

	kfree(ops->cursor_src);

	kfree(ops->fontbuffer);

	kfree(oldinfo->fbcon_par);

	oldinfo->fbcon_par = NULL;

	/*

	  If oldinfo and newinfo are driving the same hardware,

	  the fb_release() method of oldinfo may attempt to
@@ -3315,21 +3319,10 @@ static void fbcon_exit(void) 
			}

		}



		if (mapped) {

			if (info->fbcon_par) {

				struct fbcon_ops *ops = info->fbcon_par;



				fbcon_del_cursor_work(info);

				kfree(ops->cursor_src);

				kfree(ops->cursor_state.mask);

				kfree(info->fbcon_par);

				info->fbcon_par = NULL;

			}



		if (mapped)

			fbcon_release(info);

	}

}

}



void __init fb_console_init(void)

{