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: Peter Rosin <peda@axentia.se>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index 7dd6924feaa8..8aec84d888a3 100644
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -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,8 +577,8 @@ 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,
-                                       fb_logo_ex[i].logo, y, fb_logo_ex[i].n);
+                y = fb_show_logo_line(info, rotate,
+                                      fb_logo_ex[i].logo, y, fb_logo_ex[i].n);
 
         return y;
 }