diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-16 20:23:14 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-16 20:23:14 -0500 |
| commit | f253f2933b7373556329c0174dd5b101039a4056 (patch) | |
| tree | ccd88584899bdc9a66d2d20ab422acac29ab1799 /drivers | |
| parent | 035ebf85b09cf11c820ae9eec414097420741abd (diff) | |
| parent | 3b593f9030bae149af9261f51933805be506f6b1 (diff) | |
| download | u-boot-f253f2933b7373556329c0174dd5b101039a4056.zip u-boot-f253f2933b7373556329c0174dd5b101039a4056.tar.gz u-boot-f253f2933b7373556329c0174dd5b101039a4056.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/cfb_console.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index c0b1b8d..a4cbc44 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -1861,14 +1861,16 @@ static void *video_logo(void) __maybe_unused int y_off = 0; __maybe_unused ulong addr; __maybe_unused char *s; - __maybe_unused int len, space; + __maybe_unused int len, ret, space; splash_get_pos(&video_logo_xpos, &video_logo_ypos); #ifdef CONFIG_SPLASH_SCREEN s = getenv("splashimage"); if (s != NULL) { - splash_screen_prepare(); + ret = splash_screen_prepare(); + if (ret < 0) + return video_fb_address; addr = simple_strtoul(s, NULL, 16); if (video_display_bitmap(addr, |