diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-06-28 14:48:06 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-06-28 14:48:06 +0200 |
| commit | 2596ce4b4ded685b67fed407aed2bfe6ebcc39cb (patch) | |
| tree | 2b1ef3f801801509a037e51252bb262e15b60c21 | |
| parent | 6d89c73ca5813768a2cc66f7420ac0cbddf4f37d (diff) | |
| parent | e92bc059e7fa5f443e958900229bc7fa1d38fecb (diff) | |
| download | linux-2596ce4b4ded685b67fed407aed2bfe6ebcc39cb.tar.bz2 | |
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/20200619202250.19029-2-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | drivers/firmware/raspberrypi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c index ef8098856a47..625c8fdceabf 100644 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c @@ -181,6 +181,7 @@ EXPORT_SYMBOL_GPL(rpi_firmware_property); static void rpi_firmware_print_firmware_revision(struct rpi_firmware *fw) { + time64_t date_and_time; u32 packet; int ret = rpi_firmware_property(fw, RPI_FIRMWARE_GET_FIRMWARE_REVISION, @@ -189,7 +190,9 @@ rpi_firmware_print_firmware_revision(struct rpi_firmware *fw) if (ret) return; - dev_info(fw->cl.dev, "Attached to firmware from %ptT\n", &packet); + /* This is not compatible with y2038 */ + date_and_time = packet; + dev_info(fw->cl.dev, "Attached to firmware from %ptT\n", &date_and_time); } static void |