public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] splash: fix splash source flags check
@ 2016-11-16 11:02 Tomas Melin
  2016-11-17 22:19 ` Tom Rini
  0 siblings, 1 reply; 2+ messages in thread
From: Tomas Melin @ 2016-11-16 11:02 UTC (permalink / raw)
  To: u-boot

SPLASH_STORAGE_RAW is defined as 0, so a check against & will
never be true. These flags are never combined so do a check
against == instead.

Signed-off-by: Tomas Melin <tomas.melin@vaisala.com>
---
 common/splash_source.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/common/splash_source.c b/common/splash_source.c
index 230b2db..72df2c1 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -327,10 +327,9 @@ int splash_source_load(struct splash_location *locations, uint size)
 	if (!splash_location)
 		return -EINVAL;
 
-	if (splash_location->flags & SPLASH_STORAGE_RAW)
+	if (splash_location->flags == SPLASH_STORAGE_RAW)
 		return splash_load_raw(splash_location, bmp_load_addr);
-	else if (splash_location->flags & SPLASH_STORAGE_FS)
+	else if (splash_location->flags == SPLASH_STORAGE_FS)
 		return splash_load_fs(splash_location, bmp_load_addr);
-
 	return -EINVAL;
 }
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [U-Boot] [PATCH] splash: fix splash source flags check
  2016-11-16 11:02 [U-Boot] [PATCH] splash: fix splash source flags check Tomas Melin
@ 2016-11-17 22:19 ` Tom Rini
  0 siblings, 0 replies; 2+ messages in thread
From: Tom Rini @ 2016-11-17 22:19 UTC (permalink / raw)
  To: u-boot

On Wed, Nov 16, 2016 at 01:02:32PM +0200, Tomas Melin wrote:

> SPLASH_STORAGE_RAW is defined as 0, so a check against & will
> never be true. These flags are never combined so do a check
> against == instead.
> 
> Signed-off-by: Tomas Melin <tomas.melin@vaisala.com>

Reviewed-by: Tom Rini <trini@konsulko.com>

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20161117/a6aee544/attachment.sig>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-11-17 22:19 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-16 11:02 [U-Boot] [PATCH] splash: fix splash source flags check Tomas Melin
2016-11-17 22:19 ` Tom Rini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox