sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

video: cfb_console: fix hang if splashimage file is missing 

If the splash file doesn't exist, the booting stops bricking
the boards. Check return value of prepare function and stop
decoding the logo data if splash prepare stage failed.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
This commit is contained in:
Anatolij Gustschin 2016-11-30 14:30:59 +01:00
parent db1b79b886
commit b4fc6f2214
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/video/cfb_console.c
View File

@ -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,