diff options
author | Tom Rini <trini@konsulko.com> | 2015-08-26 17:48:05 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-08-26 17:48:05 -0400 |
commit | 79c884d7e449a63fa8f07b7495f8f9873355c48f (patch) | |
tree | 19adcc1b9d3520a68937a1f5f81b06775c790d8a /drivers/video/cfb_console.c | |
parent | ad608a21f89bf7467059ed59d60b080aace7ef99 (diff) | |
parent | f4b5db7c5309dd7f3ecc6369f3c1f41e8bfe93ae (diff) | |
download | blackbird-obmc-uboot-79c884d7e449a63fa8f07b7495f8f9873355c48f.tar.gz blackbird-obmc-uboot-79c884d7e449a63fa8f07b7495f8f9873355c48f.zip |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'drivers/video/cfb_console.c')
-rw-r--r-- | drivers/video/cfb_console.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 30e0317bb2..aa7ca8646d 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -2247,16 +2247,17 @@ __weak int board_video_skip(void) int drv_video_init(void) { - int skip_dev_init; struct stdio_dev console_dev; bool have_keyboard; + bool __maybe_unused keyboard_ok = false; /* Check if video initialization should be skipped */ if (board_video_skip()) return 0; /* Init video chip - returns with framebuffer cleared */ - skip_dev_init = (video_init() == -1); + if (video_init() == -1) + return 0; if (board_cfb_skip()) return 0; @@ -2272,11 +2273,9 @@ int drv_video_init(void) if (have_keyboard) { debug("KBD: Keyboard init ...\n"); #if !defined(CONFIG_VGA_AS_SINGLE_DEVICE) - skip_dev_init |= (VIDEO_KBD_INIT_FCT == -1); + keyboard_ok = !(VIDEO_KBD_INIT_FCT == -1); #endif } - if (skip_dev_init) - return 0; /* Init vga device */ memset(&console_dev, 0, sizeof(console_dev)); @@ -2287,7 +2286,7 @@ int drv_video_init(void) console_dev.puts = video_puts; /* 'puts' function */ #if !defined(CONFIG_VGA_AS_SINGLE_DEVICE) - if (have_keyboard) { + if (have_keyboard && keyboard_ok) { /* Also init console device */ console_dev.flags |= DEV_FLAGS_INPUT; console_dev.tstc = VIDEO_TSTC_FCT; /* 'tstc' function */ |