lkml.org 
[lkml]   [2016]   [Jan]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] rtc: sa1100: detect rcnr overflow with dates after 2038
Date
rcnr will overflow in 2038, detect that overflow when setting the time and
get rid of the deprecated rtc_tm_to_time()

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
drivers/rtc/rtc-sa1100.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index c2187bf6c7e4..239dd3d7df1b 100644
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -162,13 +162,16 @@ static int sa1100_rtc_read_time(struct device *dev, struct rtc_time *tm)
static int sa1100_rtc_set_time(struct device *dev, struct rtc_time *tm)
{
struct sa1100_rtc *info = dev_get_drvdata(dev);
- unsigned long time;
+ time64_t time;
int ret;

- ret = rtc_tm_to_time(tm, &time);
- if (ret == 0)
- writel_relaxed(time, info->rcnr);
- return ret;
+ time = rtc_tm_to_time64(tm);
+ if (time > U32_MAX)
+ return -EINVAL;
+
+ writel_relaxed(time, info->rcnr);
+
+ return 0;
}

static int sa1100_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
--
2.5.0

\
 
 \ /
  Last update: 2016-01-19 02:21    [W:0.042 / U:0.840 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site