]> err.no Git - linux-2.6/commitdiff
[PATCH] I2C: ds1337: Make time format consistent with other RTC drivers
authorLadislav Michl <ladis@linux-mips.org>
Wed, 4 May 2005 06:13:13 +0000 (08:13 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 22 Jun 2005 04:51:51 +0000 (21:51 -0700)
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>
drivers/i2c/chips/ds1337.c

index 89fc02b3c6d99498024a96d100ab6a54fef1825e..0967ec6d7947b803b346d4498e3b1a70eff63801 100644 (file)
@@ -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);