From: Anatolij Gustschin <agust@denx.de>
Date: Wed, 30 Nov 2016 13:30:59 +0000 (+0100)
Subject: video: cfb_console: fix hang if splashimage file is missing
X-Git-Tag: v2017.03-rc1~98^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b4fc6f221474e2bc9f3e4af52556fd4ab5cbb9b9;p=u-boot

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

diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index c0b1b8dc17..a4cbc44564 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,