diff mbox

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

Message ID 1454193919-27264-2-git-send-email-sjg@chromium.org
State Accepted
Commit e517db73a61376b940a9b352eb717f703f6b25df
Delegated to: Anatolij Gustschin
Headers show

Commit Message

Simon Glass Jan. 30, 2016, 10:45 p.m. UTC 
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(-)

Comments

Tom Rini Feb. 1, 2016, 4:54 p.m. UTC | #1 
On Sat, Jan 30, 2016 at 03:45:15PM -0700, Simon Glass wrote:

> 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>
Anatolij Gustschin Feb. 6, 2016, 1:04 p.m. UTC | #2 
On Sat, 30 Jan 2016 15:45:15 -0700
Simon Glass sjg@chromium.org wrote:

> 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(-)

applied to u-boot-staging, thanks!

--
Anatolij
diff mbox

Patch

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;
 }