diff options
| -rw-r--r-- | drivers/video/console/fbcon.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 0429fd2cece0..bd131d472e24 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c | |||
| @@ -618,8 +618,13 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info, | |||
| 618 | r -= cols; | 618 | r -= cols; |
| 619 | } | 619 | } |
| 620 | if (!save) { | 620 | if (!save) { |
| 621 | vc->vc_y += logo_lines; | 621 | int lines; |
| 622 | vc->vc_pos += logo_lines * vc->vc_size_row; | 622 | if (vc->vc_y + logo_lines >= rows) |
| 623 | lines = rows - vc->vc_y - 1; | ||
| 624 | else | ||
| 625 | lines = logo_lines; | ||
| 626 | vc->vc_y += lines; | ||
| 627 | vc->vc_pos += lines * vc->vc_size_row; | ||
| 623 | } | 628 | } |
| 624 | } | 629 | } |
| 625 | scr_memsetw((unsigned short *) vc->vc_origin, | 630 | scr_memsetw((unsigned short *) vc->vc_origin, |