video: cfb_console: fix hang if splashimage file is missing

PATCH New Anatolij Gustschin 1 participant 2 messages Nov 30, 2016 – Jan 13, 2017 Framebuffer layer

Share & tools

Anatolij Gustschin

author

2016-11-30 13:30 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 drivers/video/cfb_console.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

drivers/video/cfb_console.c +4 -2

index c0b1b8d..a4cbc44 100644
@@ -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,

Signature · 1 line

2.7.4

Anatolij Gustschin

author

2017-01-13 19:23 UTC #1 lore raw

PATCH 1/1 video: cfb_console: fix hang if splashimage file is missing

Quoted 8 lines · On Wed, 30 Nov 2016 14:30:59 +0100 Anatolij Gustschin agust at denx.de wrote:

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 <[email protected]>
---
 drivers/video/cfb_console.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

applied to u-boot-video/master.

--
Anatolij