summaryrefslogtreecommitdiffstats
path: root/drivers/firmware
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2017-12-20 17:34:40 -0800
committerFlorian Fainelli <f.fainelli@gmail.com>2017-12-20 17:34:40 -0800
commitf42a5298d99cdd4d08c96344a6050c3b6c186da1 (patch)
tree08b8ab7d4b8a8e30c2b9befafa5cfc8e69b27d4d /drivers/firmware
parent4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 (diff)
parent9107ee6a50b81180f29a9f6588b21917dde2abdd (diff)
downloadlinux-f42a5298d99cdd4d08c96344a6050c3b6c186da1.tar.gz
linux-f42a5298d99cdd4d08c96344a6050c3b6c186da1.tar.bz2
linux-f42a5298d99cdd4d08c96344a6050c3b6c186da1.zip
Merge tag 'bcm2835-drivers-next-2017-12-19' into drivers/next
This pull request brings in a (cosmetic) y2038 fix for the Raspberry Pi firmware driver. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'drivers/firmware')
-rw-r--r--drivers/firmware/raspberrypi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
index dd506cd3a5b8..6692888f04cf 100644
--- a/drivers/firmware/raspberrypi.c
+++ b/drivers/firmware/raspberrypi.c
@@ -174,7 +174,7 @@ rpi_firmware_print_firmware_revision(struct rpi_firmware *fw)
if (ret == 0) {
struct tm tm;
- time_to_tm(packet, 0, &tm);
+ time64_to_tm(packet, 0, &tm);
dev_info(fw->cl.dev,
"Attached to firmware from %04ld-%02d-%02d %02d:%02d\n",