summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-01-30 15:45:15 -0700
committerAnatolij Gustschin <agust@denx.de>2016-02-06 13:53:09 +0100
commite517db73a61376b940a9b352eb717f703f6b25df (patch)
tree62f10f49d487b506a81f2c599a54905f02625cdf
parenta7c45ec4d63e773cf920cfedfb67e96fe0b8526a (diff)
downloadu-boot-imx-e517db73a61376b940a9b352eb717f703f6b25df.zip
u-boot-imx-e517db73a61376b940a9b352eb717f703f6b25df.tar.gz
u-boot-imx-e517db73a61376b940a9b352eb717f703f6b25df.tar.bz2
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> Reviewed-by: Tom Rini <trini@konsulko.com>
-rw-r--r--cmd/bmp.c3
1 files changed, 1 insertions, 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;
}