diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-22 20:31:15 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-22 20:31:15 +0200 |
| commit | 5d4156ac48a4f4c0b7f980a51937e33362f78911 (patch) | |
| tree | ab9fcc00f6883cefbb1d48c310fbf66240976ad8 /drivers/firmware | |
| parent | modules: make MODULE_IMPORT_NS() work even when modular builds are disabled (diff) | |
| download | linux-5d4156ac48a4f4c0b7f980a51937e33362f78911.tar.xz linux-5d4156ac48a4f4c0b7f980a51937e33362f78911.zip | |
firmware: bcm47xx_nvram: _really_ correct size_t printf format
Commit feb4eb060c3a ("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>
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/broadcom/bcm47xx_nvram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmware/broadcom/bcm47xx_nvram.c index 6d2820f6aca1..da04fdae62a1 100644 --- a/drivers/firmware/broadcom/bcm47xx_nvram.c +++ b/drivers/firmware/broadcom/bcm47xx_nvram.c @@ -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; } |