Skip to content

Commit 2596ce4

Browse files
committed
Merge tag 'arm-soc/for-5.8/drivers-fixes' of https://github.com/Broadcom/stblinux into arm/fixes
This pull request contains Broadcom ARM/ARM64/MIPS SoCs drivers fixes for 5.8, please pull the following: - Andy provides a fix for the Raspberry Pi firmware driver to print the correct time upon boot. This is a fallout from a converstion to use the ptT format * tag 'arm-soc/for-5.8/drivers-fixes' of https://github.com/Broadcom/stblinux: ARM: bcm2835: Fix integer overflow in rpi_firmware_print_firmware_revision() Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 6d89c73 + e92bc05 commit 2596ce4

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/firmware/raspberrypi.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ EXPORT_SYMBOL_GPL(rpi_firmware_property);
181181
static void
182182
rpi_firmware_print_firmware_revision(struct rpi_firmware *fw)
183183
{
184+
time64_t date_and_time;
184185
u32 packet;
185186
int ret = rpi_firmware_property(fw,
186187
RPI_FIRMWARE_GET_FIRMWARE_REVISION,
@@ -189,7 +190,9 @@ rpi_firmware_print_firmware_revision(struct rpi_firmware *fw)
189190
if (ret)
190191
return;
191192

192-
dev_info(fw->cl.dev, "Attached to firmware from %ptT\n", &packet);
193+
/* This is not compatible with y2038 */
194+
date_and_time = packet;
195+
dev_info(fw->cl.dev, "Attached to firmware from %ptT\n", &date_and_time);
193196
}
194197

195198
static void

0 commit comments

Comments
 (0)