Skip to content

Commit

Permalink
firmware: bcm47xx_nvram: _really_ correct size_t printf format
Browse files Browse the repository at this point in the history
Commit feb4eb0 ("firmware: bcm47xx_nvram: Correct size_t printf
format") was wrong, and changed a printout of 'header.len' - which is an
u32 type - to use '%zu'.

It apparently did pattern matching on the other case, where it printed
out 'nvram_len', which is indeed of type 'size_t'.

Rather than undoing the change, this just makes it use the variable that
the change seemed to expect to be used.

Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Cc: Paul Burton <paul.burton@mips.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Linus Torvalds committed Sep 22, 2019
1 parent 3e4d890 commit 5d4156a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/firmware/broadcom/bcm47xx_nvram.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ static int nvram_init(void)
nvram_len = header.len;
if (nvram_len >= NVRAM_SPACE) {
pr_err("nvram on flash (%zu bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
header.len, NVRAM_SPACE);
nvram_len, NVRAM_SPACE);
nvram_len = NVRAM_SPACE - 1;
}

Expand Down

0 comments on commit 5d4156a

Please sign in to comment.