|
@@ -94,15 +94,14 @@ static int nvram_find_and_copy(void __iomem *iobase, u32 lim)
|
|
|
|
|
|
found:
|
|
|
__ioread32_copy(nvram_buf, header, sizeof(*header) / 4);
|
|
|
- header = (struct nvram_header *)nvram_buf;
|
|
|
- nvram_len = header->len;
|
|
|
+ nvram_len = ((struct nvram_header *)(nvram_buf))->len;
|
|
|
if (nvram_len > size) {
|
|
|
pr_err("The nvram size according to the header seems to be bigger than the partition on flash\n");
|
|
|
nvram_len = size;
|
|
|
}
|
|
|
if (nvram_len >= NVRAM_SPACE) {
|
|
|
pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
|
|
|
- header->len, NVRAM_SPACE - 1);
|
|
|
+ nvram_len, NVRAM_SPACE - 1);
|
|
|
nvram_len = NVRAM_SPACE - 1;
|
|
|
}
|
|
|
/* proceed reading data after header */
|