[U-Boot] [PATCH 2/6] cmd: Fix control bmp_display()

All paths should share the same return.

Reported-by: Coverity (CID:134903)

Signed-off-by: Simon Glass sjg@chromium.org ---

cmd/bmp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cmd/bmp.c b/cmd/bmp.c index fd5b7db..01b3d39 100644 --- a/cmd/bmp.c +++ b/cmd/bmp.c @@ -259,7 +259,6 @@ int bmp_display(ulong addr, int x, int y) 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 +270,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; }