diff options
| -rw-r--r-- | drivers/video/console/vgacon.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c index 2460b82a1d93..f46fe95f69fb 100644 --- a/drivers/video/console/vgacon.c +++ b/drivers/video/console/vgacon.c | |||
| @@ -368,9 +368,14 @@ static const char *vgacon_startup(void) | |||
| 368 | #endif | 368 | #endif |
| 369 | } | 369 | } |
| 370 | 370 | ||
| 371 | /* SCREEN_INFO initialized? */ | ||
| 372 | if ((ORIG_VIDEO_MODE == 0) && | ||
| 373 | (ORIG_VIDEO_LINES == 0) && | ||
| 374 | (ORIG_VIDEO_COLS == 0)) | ||
| 375 | goto no_vga; | ||
| 376 | |||
| 371 | /* VGA16 modes are not handled by VGACON */ | 377 | /* VGA16 modes are not handled by VGACON */ |
| 372 | if ((ORIG_VIDEO_MODE == 0x00) || /* SCREEN_INFO not initialized */ | 378 | if ((ORIG_VIDEO_MODE == 0x0D) || /* 320x200/4 */ |
| 373 | (ORIG_VIDEO_MODE == 0x0D) || /* 320x200/4 */ | ||
| 374 | (ORIG_VIDEO_MODE == 0x0E) || /* 640x200/4 */ | 379 | (ORIG_VIDEO_MODE == 0x0E) || /* 640x200/4 */ |
| 375 | (ORIG_VIDEO_MODE == 0x10) || /* 640x350/4 */ | 380 | (ORIG_VIDEO_MODE == 0x10) || /* 640x350/4 */ |
| 376 | (ORIG_VIDEO_MODE == 0x12) || /* 640x480/4 */ | 381 | (ORIG_VIDEO_MODE == 0x12) || /* 640x480/4 */ |