]> git.ipfire.org Git - u-boot.git/commitdiff
splash: fix splash source flags check
authortomas.melin@vaisala.com <tomas.melin@vaisala.com>
Wed, 16 Nov 2016 11:02:32 +0000 (13:02 +0200)
committerAnatolij Gustschin <agust@denx.de>
Fri, 13 Jan 2017 19:45:25 +0000 (20:45 +0100)
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>
common/splash_source.c

index 4c64f10c500ab2e0826f3537ee65a6c8d552f36c..a5eeb3f12c581e0f1d58792a250da16345e551c6 100644 (file)
@@ -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)