From: Ben Dooks <ben-linux@fluff.org>
To: linux-kernel@vger.kernel.org, akpm@osdl.org
Subject: [PATCH] rtc-s3c.c: fix time setting checks
Date: Tue, 15 Aug 2006 10:24:29 +0100 [thread overview]
Message-ID: <20060815092429.GA13940@home.fluff.org> (raw)
Fix the checking of the range for the year when
setting time with the S3C24XX RTC driver
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
diff -urpN -X ../dontdiff linux-2.6.18-rc4-all1/drivers/rtc/rtc-s3c.c linux-2.6.18-rc4-all2/drivers/rtc/rtc-s3c.c
--- linux-2.6.18-rc4-all1/drivers/rtc/rtc-s3c.c 2006-08-14 09:04:57.000000000 +0100
+++ linux-2.6.18-rc4-all2/drivers/rtc/rtc-s3c.c 2006-08-14 09:59:47.000000000 +0100
@@ -11,6 +11,8 @@
* S3C2410/S3C2440/S3C24XX Internal RTC Driver
*/
+//B#define DEBUG
+
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/string.h>
@@ -153,24 +155,25 @@ static int s3c_rtc_gettime(struct device
static int s3c_rtc_settime(struct device *dev, struct rtc_time *tm)
{
void __iomem *base = s3c_rtc_base;
+ int year = tm->tm_year - 100;
+
+ pr_debug("set time %02d.%02d.%02d %02d/%02d/%02d\n",
+ tm->tm_year, tm->tm_mon, tm->tm_mday,
+ tm->tm_hour, tm->tm_min, tm->tm_sec);
- /* the rtc gets round the y2k problem by just not supporting it */
+ /* we get around y2k by simply not supporting it */
- if (tm->tm_year > 100) {
+ if (year < 0 || year >= 100) {
dev_err(dev, "rtc only supports 100 years\n");
return -EINVAL;
}
- pr_debug("set time %02d.%02d.%02d %02d/%02d/%02d\n",
- tm->tm_year, tm->tm_mon, tm->tm_mday,
- tm->tm_hour, tm->tm_min, tm->tm_sec);
-
writeb(BIN2BCD(tm->tm_sec), base + S3C2410_RTCSEC);
writeb(BIN2BCD(tm->tm_min), base + S3C2410_RTCMIN);
writeb(BIN2BCD(tm->tm_hour), base + S3C2410_RTCHOUR);
writeb(BIN2BCD(tm->tm_mday), base + S3C2410_RTCDATE);
writeb(BIN2BCD(tm->tm_mon + 1), base + S3C2410_RTCMON);
- writeb(BIN2BCD(tm->tm_year - 100), base + S3C2410_RTCYEAR);
+ writeb(BIN2BCD(year), base + S3C2410_RTCYEAR);
return 0;
}
next reply other threads:[~2006-08-15 9:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-15 9:24 Ben Dooks [this message]
2006-08-15 10:27 ` Jiri Slaby
2006-08-15 20:53 Ben Dooks
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060815092429.GA13940@home.fluff.org \
--to=ben-linux@fluff.org \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®