From: Linus Torvalds Date: Sun, 22 Sep 2019 18:31:15 +0000 (-0700) Subject: firmware: bcm47xx_nvram: _really_ correct size_t printf format X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5d4156ac48a4f4c0b7f980a51937e33362f78911;p=linux.git 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 Cc: Philippe Mathieu-Daudé Cc: Paul Burton Signed-off-by: Linus Torvalds --- diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmware/broadcom/bcm47xx_nvram.c index 6d2820f6aca13..da04fdae62a15 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; }