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

From: "tomas.melin@vaisala.com" tomas.melin@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@vaisala.com Reviewed-by: Tom Rini trini@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)

Hi
On 14 Jan 2017 3:54 a.m., "Anatolij Gustschin" agust@denx.de wrote:
From: "tomas.melin@vaisala.com" tomas.melin@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@vaisala.com Reviewed-by: Tom Rini trini@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)
So switch
Michael
-- 2.7.4
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot

Hi,
On 01/16/2017 08:36 PM, Michael Nazzareno Trimarchi wrote:
Hi
On 14 Jan 2017 3:54 a.m., "Anatolij Gustschin" agust@denx.de wrote:
From: "tomas.melin@vaisala.com" tomas.melin@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@vaisala.com Reviewed-by: Tom Rini trini@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)
So switch
Yes, maybe indeed it makes sense to change to a switch case instead for these. I will send a new patch.
Tomas
Michael
-- 2.7.4
U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
participants (3)
-
Anatolij Gustschin
-
Michael Nazzareno Trimarchi
-
Tomas Melin