tpm: st33zp24: fix STMicroelectronics copyright

[people/ms/u-boot.git] / fs / ubifs / ubifs.c

diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index cdc04c662dd8d9c358c344b8a7e02e83bc5effad..8f1c9d167d741fe0a1b65475de10713785d29e1d 100644 (file)
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -854,7 +854,7 @@ int ubifs_read(const char *filename, void *buf, loff_t offset,
        *actread = 0;
 
        if (offset & (PAGE_SIZE - 1)) {
-               printf("ubifs: Error offset must be a multple of %d\n",
+               printf("ubifs: Error offset must be a multiple of %d\n",
                       PAGE_SIZE);
                return -1;
        }
@@ -939,9 +939,9 @@ int ubifs_load(char *filename, u32 addr, u32 size)
 
        printf("Loading file '%s' to addr 0x%08x...\n", filename, addr);
 
-       err = ubifs_read(filename, (void *)addr, 0, size, &actread);
+       err = ubifs_read(filename, (void *)(uintptr_t)addr, 0, size, &actread);
        if (err == 0) {
-               setenv_hex("filesize", actread);
+               env_set_hex("filesize", actread);
                printf("Done\n");
        }