show_splash() computed the result of video_bmp_display() but discarded
it and always returned 0, so a failing splash display was silently
ignored by video_post_probe(). Return the value directly instead.

This has the side effect of actually making the whole video device fail
to probe (no display), where before the console came up fine minus the
logo.

Signed-off-by: Julien Stephan <[email protected]>
---
 drivers/video/video-uclass.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 228d6bacc58..de161054d52 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -595,11 +595,8 @@ void *video_get_u_boot_logo(void)
 static int show_splash(struct udevice *dev)
 {
        u8 *data = SPLASH_START(u_boot_logo);
-       int ret;
-
-       ret = video_bmp_display(dev, map_to_sysmem(data), -4, 4, true);
 
-       return 0;
+       return video_bmp_display(dev, map_to_sysmem(data), -4, 4, true);
 }
 
 int video_default_font_height(struct udevice *dev)

-- 
2.55.0

Reply via email to