[PATCH] rtc: sa1100: detect rcnr overflow with dates after 2038

From	Alexandre Belloni <alexandre.belloni@free-electrons.com>
Newsgroups	linux.kernel
Subject	[PATCH] rtc: sa1100: detect rcnr overflow with dates after 2038
Date	2016-01-19 02:00 +0100
Message-ID	<qSsOl-8n-1@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] rtc: sa1100: detect rcnr overflow with dates after 2038 Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2016-01-19 02:00 +0100
  Re: [PATCH] rtc: sa1100: detect rcnr overflow with dates after 2038 Robert Jarzmik <robert.jarzmik@free.fr> - 2016-01-19 21:20 +0100
    Re: [PATCH] rtc: sa1100: detect rcnr overflow with dates after 2038 Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2016-01-19 21:50 +0100

csiph-web