]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
env_ubi.c: Correct pointer error in env load
authorKevin Smith <kevin.smith@elecsyscorp.com>
Fri, 23 Oct 2015 17:51:47 +0000 (17:51 +0000)
committerHeiko Schocher <hs@denx.de>
Thu, 19 Nov 2015 06:32:49 +0000 (07:32 +0100)
The variable "buf" in this function is a char array, and the
function ubi_volume_read is expecting a char *.  In the call, the
address of the pointer is being taken, incorrectly passing a
char **.  The compiler warning was being silenced by the cast.
Remove the address operator and the cast.

Signed-off-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Tom Rini <trini@konsulko.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
common/env_ubi.c

index e0dc5af8513e60d680080593a2a2fa91797964f0..e611199a58d6d30a69e72dc5c95fa39e9577dff8 100644 (file)
@@ -181,8 +181,7 @@ void env_relocate_spec(void)
                return;
        }
 
-       if (ubi_volume_read(CONFIG_ENV_UBI_VOLUME, (void *)&buf,
-                           CONFIG_ENV_SIZE)) {
+       if (ubi_volume_read(CONFIG_ENV_UBI_VOLUME, buf, CONFIG_ENV_SIZE)) {
                printf("\n** Unable to read env from %s:%s **\n",
                       CONFIG_ENV_UBI_PART, CONFIG_ENV_UBI_VOLUME);
                set_default_env(NULL);