aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorLadislav Michl <ladis@linux-mips.org>2005-05-04 08:13:13 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2005-06-21 21:51:51 -0700
commit0b46e334d77b2d3b8b3aa665c81c4afbe9f1f458 (patch)
treeecf82d1aa2a4416835a082500970df3784e1194e /drivers/i2c
parentd01b79d0613ebb6810bb48baf6e53e9319701fea (diff)
downloadkernel_samsung_smdk4412-0b46e334d77b2d3b8b3aa665c81c4afbe9f1f458.zip
kernel_samsung_smdk4412-0b46e334d77b2d3b8b3aa665c81c4afbe9f1f458.tar.gz
kernel_samsung_smdk4412-0b46e334d77b2d3b8b3aa665c81c4afbe9f1f458.tar.bz2
[PATCH] I2C: ds1337: Make time format consistent with other RTC drivers
Make time format consistent with other RTC drivers. Signed-off-by: Ladislav Michl <ladis@linux-mips.org> Signed-off-by: James Chapman <jchapman@katalix.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/chips/ds1337.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/i2c/chips/ds1337.c b/drivers/i2c/chips/ds1337.c
index 89fc02b..0967ec6 100644
--- a/drivers/i2c/chips/ds1337.c
+++ b/drivers/i2c/chips/ds1337.c
@@ -130,8 +130,8 @@ static int ds1337_get_datetime(struct i2c_client *client, struct rtc_time *dt)
dt->tm_wday = BCD2BIN(buf[3]) - 1;
dt->tm_mday = BCD2BIN(buf[4]);
val = buf[5] & 0x7f;
- dt->tm_mon = BCD2BIN(val);
- dt->tm_year = 1900 + BCD2BIN(buf[6]);
+ dt->tm_mon = BCD2BIN(val) - 1;
+ dt->tm_year = BCD2BIN(buf[6]);
if (buf[5] & 0x80)
dt->tm_year += 100;
@@ -171,12 +171,11 @@ static int ds1337_set_datetime(struct i2c_client *client, struct rtc_time *dt)
buf[3] = BIN2BCD(dt->tm_hour) | (1 << 6);
buf[4] = BIN2BCD(dt->tm_wday) + 1;
buf[5] = BIN2BCD(dt->tm_mday);
- buf[6] = BIN2BCD(dt->tm_mon);
- if (dt->tm_year >= 2000) {
- val = dt->tm_year - 2000;
+ buf[6] = BIN2BCD(dt->tm_mon) + 1;
+ val = dt->tm_year;
+ if (val >= 100) {
+ val -= 100;
buf[6] |= (1 << 7);
- } else {
- val = dt->tm_year - 1900;
}
buf[7] = BIN2BCD(val);