summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuiling Deng <greens9@163.com>2022-06-28 09:36:41 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-07-12 16:32:18 +0200
commitd03e8ed72d7dae6874ee6cf7ae02029a727e7559 (patch)
tree97eec22e31e879b0354803e5d75b33ca27d60063
parent963c80f070ed513b9c6ac29c9236801fba6eefc4 (diff)
downloadlinux-d03e8ed72d7dae6874ee6cf7ae02029a727e7559.tar.gz
linux-d03e8ed72d7dae6874ee6cf7ae02029a727e7559.tar.bz2
linux-d03e8ed72d7dae6874ee6cf7ae02029a727e7559.zip
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: 3d8b1933eb1c ("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>
-rw-r--r--drivers/video/fbdev/core/fbmem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index 00939ca2065a..bf61770f6f6b 100644
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -513,7 +513,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;