net: phy: micrel: add an option to disable gigabit for the KSZ9031

[people/ms/u-boot.git] / cmd / bmp.c

diff --git a/cmd/bmp.c b/cmd/bmp.c
index fd5b7db28852a7dcf225b066744e4591658dcb28..fb6fe3f286c5434f1cd15eba5ee28b8f4166fbd4 100644 (file)
--- a/cmd/bmp.c
+++ b/cmd/bmp.c
@@ -246,20 +246,15 @@ int bmp_display(ulong addr, int x, int y)
        addr = map_to_sysmem(bmp);
 
 #ifdef CONFIG_DM_VIDEO
-       ret = uclass_first_device(UCLASS_VIDEO, &dev);
+       ret = uclass_first_device_err(UCLASS_VIDEO, &dev);
        if (!ret) {
-               if (!dev)
-                       ret = -ENODEV;
-               if (!ret) {
-                       bool align = false;
+               bool align = false;
 
 # ifdef CONFIG_SPLASH_SCREEN_ALIGN
-                       align = true;
+               align = true;
 # endif /* CONFIG_SPLASH_SCREEN_ALIGN */
-                       ret = video_bmp_display(dev, addr, x, y, align);
-               }
+               ret = video_bmp_display(dev, addr, x, y, align);
        }
-       return ret ? CMD_RET_FAILURE : 0;
 #elif defined(CONFIG_LCD)
        ret = lcd_display_bitmap(addr, x, y);
 #elif defined(CONFIG_VIDEO)
@@ -271,5 +266,5 @@ int bmp_display(ulong addr, int x, int y)
        if (bmp_alloc_addr)
                free(bmp_alloc_addr);
 
-       return ret;
+       return ret ? CMD_RET_FAILURE : 0;
 }