diff options
| author | Emil Bartczak <emilbart@gmail.com> | 2016-12-08 00:27:39 +0100 |
|---|---|---|
| committer | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2016-12-19 00:59:23 +0100 |
| commit | 26eeefd5956449b03c87c49b996e012ffe3e59aa (patch) | |
| tree | 8ce99f7233d9143117e892e4f3a9316e19667985 /drivers/rtc/rtc-mcp795.c | |
| parent | rtc: mcp795: fix bitmask value for leap year (LP). (diff) | |
| download | linux-26eeefd5956449b03c87c49b996e012ffe3e59aa.tar.xz linux-26eeefd5956449b03c87c49b996e012ffe3e59aa.zip | |
rtc: mcp795: fix time range difference between linux and RTC chip.
In linux rtc_time struct, tm_mon range is 0~11, while in RTC HW REG,
month range is 1~12. This patch adjusts difference of them.
Signed-off-by: Emil Bartczak <emilbart@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Diffstat (limited to 'drivers/rtc/rtc-mcp795.c')
| -rw-r--r-- | drivers/rtc/rtc-mcp795.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-mcp795.c b/drivers/rtc/rtc-mcp795.c index 5fbdb4c20a9b..4618f4fa655f 100644 --- a/drivers/rtc/rtc-mcp795.c +++ b/drivers/rtc/rtc-mcp795.c @@ -110,7 +110,7 @@ static int mcp795_set_time(struct device *dev, struct rtc_time *tim) data[1] = (data[1] & 0x80) | bin2bcd(tim->tm_min); data[2] = bin2bcd(tim->tm_hour); data[4] = bin2bcd(tim->tm_mday); - data[5] = (data[5] & MCP795_LP_BIT) | bin2bcd(tim->tm_mon); + data[5] = (data[5] & MCP795_LP_BIT) | bin2bcd(tim->tm_mon + 1); if (tim->tm_year > 100) tim->tm_year -= 100; @@ -143,7 +143,7 @@ static int mcp795_read_time(struct device *dev, struct rtc_time *tim) tim->tm_min = bcd2bin(data[1] & 0x7F); tim->tm_hour = bcd2bin(data[2] & 0x3F); tim->tm_mday = bcd2bin(data[4] & 0x3F); - tim->tm_mon = bcd2bin(data[5] & 0x1F); + tim->tm_mon = bcd2bin(data[5] & 0x1F) - 1; tim->tm_year = bcd2bin(data[6]) + 100; /* Assume we are in 20xx */ dev_dbg(dev, "Read from mcp795: %04d-%02d-%02d %02d:%02d:%02d\n", |