Commit 407c1b49 authored Jun 28, 2022 by Guiling Deng Committed by Greg Kroah-Hartman Jul 12, 2022

fbdev: fbmem: Fix logo center image dx issue



commit 955f04766d4e6eb94bf3baa539e096808c74ebfb upstream.

Image.dx gets wrong value because of missing '()'.

If xres == logo->width and n == 1, image.dx = -16.

Signed-off-by: Guiling Deng <greens9@163.com>
Fixes: 3d8b1933 ("fbdev: fbmem: add config option to center the bootup logo")
Cc: stable@vger.kernel.org # v5.0+
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 14ff1184

drivers/video/fbdev/core/fbmem.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -512,7 +512,7 @@ static int fb_show_logo_line(struct fb_info *info, int rotate,

		while (n && (n * (logo->width + 8) - 8 > xres))
		--n;
		image.dx = (xres - n * (logo->width + 8) - 8) / 2;
		image.dx = (xres - (n * (logo->width + 8) - 8)) / 2;
		image.dy = y ?: (yres - logo->height) / 2;
		} else {
		image.dx = 0;