[U-Boot] [PATCH v2] splash: fix splash source flags check

Anatolij Gustschin agust at denx.de
Fri Jan 13 20:54:23 CET 2017


From: "tomas.melin at vaisala.com" <tomas.melin at vaisala.com>

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 at vaisala.com>
Reviewed-by: Tom Rini <trini at konsulko.com>
---

Changes in v2:
- rebased on u-boot-video/master

 common/splash_source.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/splash_source.c b/common/splash_source.c
index 4c64f10..a5eeb3f 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -395,9 +395,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);
 #ifdef CONFIG_FIT
 	else if (splash_location->flags == SPLASH_STORAGE_FIT)
-- 
2.7.4



More information about the U-Boot mailing list