Skip to content

Commit

Permalink
video: cfb_console: fix hang if splashimage file is missing
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
vdsao committed Jan 13, 2017
1 parent db1b79b commit b4fc6f2
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/video/cfb_console.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit b4fc6f2

Please sign in to comment.