From: Johannes Weiner <jw@emlix.com>
To: Alessandro Zummo <a.zummo@towertech.it>,
Paul Gortmaker <p_gortmaker@yahoo.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org
Subject: [patch 1/3] rtc-x1205: fix rtc_time to y2k register value conversion
Date: Wed, 25 Nov 2009 17:32:14 +0100 [thread overview]
Message-ID: <1259166736-31006-1-git-send-email-jw@emlix.com> (raw)
The possible CCR_Y2K register values are 19 or 20 and struct
rtc_time's tm_year is in years since 1900.
The function translating rtc_time to register values assumes tm_year
to be years since first christmas, though, and we end up storing 0 or
1 in the CCR_Y2K register, which the hardware does not refuse to do.
A subsequent probing of the clock fails due to the invalid value range
in the register, though.
[ And if it didn't, reading the clock would yield a bogus year because
the function translating registers to tm_year is assuming a register
value of 19 or 20. ]
This fixes the conversion from years since 1900 in tm_year to the
corresponding CCR_Y2K value of 19 or 20.
Signed-off-by: Johannes Weiner <jw@emlix.com>
---
drivers/rtc/rtc-x1205.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c
index 310c107..cc9ba47 100644
--- a/drivers/rtc/rtc-x1205.c
+++ b/drivers/rtc/rtc-x1205.c
@@ -195,7 +195,7 @@ static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm,
/* year, since the rtc epoch*/
buf[CCR_YEAR] = bin2bcd(tm->tm_year % 100);
buf[CCR_WDAY] = tm->tm_wday & 0x07;
- buf[CCR_Y2K] = bin2bcd(tm->tm_year / 100);
+ buf[CCR_Y2K] = bin2bcd((tm->tm_year + 1900) / 100);
}
/* If writing alarm registers, set compare bits on registers 0-4 */
--
1.6.5
next reply other threads:[~2009-11-25 17:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-25 16:32 Johannes Weiner [this message]
2009-11-25 16:32 ` [patch 2/3] rtc-x1205: reset clock to sane state after power failure Johannes Weiner
2009-11-25 16:32 ` [patch 3/3] rtc-x1205: unconditionally set date when setting clock Johannes Weiner
2009-11-25 22:11 ` [patch 1/3] rtc-x1205: fix rtc_time to y2k register value conversion Andrew Morton
2009-11-26 1:02 ` Johannes Weiner
2009-11-26 21:40 ` Alessandro Zummo
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=1259166736-31006-1-git-send-email-jw@emlix.com \
--to=jw@emlix.com \
--cc=a.zummo@towertech.it \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=p_gortmaker@yahoo.com \
--cc=rtc-linux@googlegroups.com \
/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®