ARM: uniphier: disable CONFIG_MTD_NOR_FLASH

[oweals/u-boot.git] / fs / cbfs / cbfs.c

diff --git a/fs/cbfs/cbfs.c b/fs/cbfs/cbfs.c
index 95a48a46f53805c78c63febfad42f7e9755c3087..6e1107d751bc63b7c0603bda218234c41d8cd03d 100644 (file)
--- a/fs/cbfs/cbfs.c
+++ b/fs/cbfs/cbfs.c
@@ -97,8 +97,8 @@ static int file_cbfs_next_file(u8 *start, u32 size, u32 align,
                }
 
                swap_file_header(&header, fileHeader);
-               if (header.offset < sizeof(const struct cbfs_cachenode *) ||
-                               header.offset > header.len) {
+               if (header.offset < sizeof(struct cbfs_fileheader) ||
+                   header.offset > header.len) {
                        file_cbfs_result = CBFS_BAD_FILE;
                        return -1;
                }
@@ -106,9 +106,9 @@ static int file_cbfs_next_file(u8 *start, u32 size, u32 align,
                newNode->type = header.type;
                newNode->data = start + header.offset;
                newNode->data_length = header.len;
-               name_len = header.offset - sizeof(struct cbfs_cachenode *);
+               name_len = header.offset - sizeof(struct cbfs_fileheader);
                newNode->name = (char *)fileHeader +
-                               sizeof(struct cbfs_cachenode *);
+                               sizeof(struct cbfs_fileheader);
                newNode->name_length = name_len;
                newNode->checksum = header.checksum;