diff options
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/core/fbmem.c | 6 |
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, | |||
| 525 | info->pseudo_palette = saved_pseudo_palette; | 525 | info->pseudo_palette = saved_pseudo_palette; |
| 526 | kfree(logo_new); | 526 | kfree(logo_new); |
| 527 | kfree(logo_rotate); | 527 | kfree(logo_rotate); |
| 528 | return logo->height; | 528 | return image.dy + logo->height; |
| 529 | } | 529 | } |
| 530 | 530 | ||
| 531 | 531 | ||
| @@ -577,8 +577,8 @@ static int fb_show_extra_logos(struct fb_info *info, int y, int rotate) | |||
| 577 | unsigned int i; | 577 | unsigned int i; |
| 578 | 578 | ||
| 579 | for (i = 0; i < fb_logo_ex_num; i++) | 579 | for (i = 0; i < fb_logo_ex_num; i++) |
| 580 | y += fb_show_logo_line(info, rotate, | 580 | y = fb_show_logo_line(info, rotate, |
| 581 | fb_logo_ex[i].logo, y, fb_logo_ex[i].n); | 581 | fb_logo_ex[i].logo, y, fb_logo_ex[i].n); |
| 582 | 582 | ||
| 583 | return y; | 583 | return y; |
| 584 | } | 584 | } |
