diff mbox series

fbdev: fbmem: Fix logo center image dx issue

Message ID 20220628163641.4167-1-greens9@163.com (mailing list archive)
State Accepted, archived
Delegated to: Helge Deller
Headers show
Series fbdev: fbmem: Fix logo center image dx issue | expand

Commit Message

Guiling Deng June 28, 2022, 4:36 p.m. UTC
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>
---
 drivers/video/fbdev/core/fbmem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Helge Deller June 30, 2022, 6:51 a.m. UTC | #1
On 6/28/22 18:36, Guiling Deng wrote:
> 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>

Nice catch!

applied to the fbdev tree.

Thanks,
Helge

> ---
>  drivers/video/fbdev/core/fbmem.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
> index c4a18322dee9..1fd2bdb11266 100644
> --- a/drivers/video/fbdev/core/fbmem.c
> +++ b/drivers/video/fbdev/core/fbmem.c
> @@ -511,7 +511,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;
diff mbox series

Patch

diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index c4a18322dee9..1fd2bdb11266 100644
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -511,7 +511,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;