Commit e41f184d authored by Peter Rosin's avatar Peter Rosin Committed by Bartlomiej Zolnierkiewicz
Browse files

fbdev: fbmem: make fb_show_logo_line return the end instead of the height 



In preparation for allowing centering of the bootup logo, make
fb_show_logo_line return where the next free framebuffer line is,
instead of returning the height of the shown logo.

Signed-off-by: default avatarPeter Rosin <peda@axentia.se>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent 26073918

drivers/video/fbdev/core/fbmem.c

+3 −3
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static int fb_show_logo_line(struct fb_info *info, int rotate, 
		info->pseudo_palette = saved_pseudo_palette;

	kfree(logo_new);

	kfree(logo_rotate);

	return logo->height;

	return image.dy + logo->height;

}
@@ -577,7 +577,7 @@ static int fb_show_extra_logos(struct fb_info *info, int y, int rotate) 
	unsigned int i;



	for (i = 0; i < fb_logo_ex_num; i++)

		y += fb_show_logo_line(info, rotate,

		y = fb_show_logo_line(info, rotate,

				      fb_logo_ex[i].logo, y, fb_logo_ex[i].n);



	return y;

CRA Git | Maintained and supported by SUSTech CRA and CCSE