Attachment #274491 for bug #368109





static int do_register_framebuffer(struct fb_info *fb_info)
{
	mutex_lock(&registration_lock);
	int i;
	struct fb_event event;
	struct fb_videomode mode;

	fb_var_to_videomode(&mode, &fb_info->var);
	fb_add_videomode(&mode, &fb_info->modelist);
	registered_fb[i] = fb_info;
	mutex_unlock(&registration_lock);

	event.info = fb_info;
	if (!lock_fb_info(fb_info))

{
	int ret;

	mutex_lock(&registration_lock);
	ret = do_register_framebuffer(fb_info);
	mutex_unlock(&registration_lock);

	return ret;
}

Return to bug 368109

Lines 1569-1574 static void do_remove_conflicting_framebuffers(struct apertures_struct *a, Link Here

(-)a/drivers/video/fbmem.c (-2 / +2 lines)
1569		1569
1570	static int do_register_framebuffer(struct fb_info *fb_info)	1570	static int do_register_framebuffer(struct fb_info *fb_info)
1571	{	1571	{
		1572	mutex_lock(&registration_lock);
1572	int i;	1573	int i;
1573	struct fb_event event;	1574	struct fb_event event;
1574	struct fb_videomode mode;	1575	struct fb_videomode mode;
Lines 1624-1629 static int do_register_framebuffer(struct fb_info *fb_info) Link Here
1624	fb_var_to_videomode(&mode, &fb_info->var);	1625	fb_var_to_videomode(&mode, &fb_info->var);
1625	fb_add_videomode(&mode, &fb_info->modelist);	1626	fb_add_videomode(&mode, &fb_info->modelist);
1626	registered_fb[i] = fb_info;	1627	registered_fb[i] = fb_info;
		1628	mutex_unlock(&registration_lock);
1627		1629
1628	event.info = fb_info;	1630	event.info = fb_info;
1629	if (!lock_fb_info(fb_info))	1631	if (!lock_fb_info(fb_info))
Lines 1690-1698 register_framebuffer(struct fb_info *fb_info) Link Here
1690	{	1692	{
1691	int ret;	1693	int ret;
1692		1694
1693	mutex_lock(&registration_lock);
1694	ret = do_register_framebuffer(fb_info);	1695	ret = do_register_framebuffer(fb_info);
1695	mutex_unlock(&registration_lock);
1696		1696
1697	return ret;	1697	return ret;
1698	}	1698	}