diff options
author | Jan Kardell <jan.kardell@telliq.com> | 2014-12-10 18:53:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-10 20:41:15 -0500 |
commit | c7aef4f88629dcd6efbf9c80c9805625e149c868 (patch) | |
tree | 6d82119f56e9db126319ad9e4b14885c91a3e2c2 /drivers/rtc | |
parent | 45ef0458fb2b931962f8558e1fd145e63ea990ab (diff) |
rtc: pcf8563: fix wrong time from read_alarm
Incorrect mask was used for hour and monthday fields.
Signed-off-by: Jan Kardell <jan.kardell@telliq.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Vincent Donnefort <vdonnefort@gmail.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/rtc-pcf8563.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c index 8c23606ce2cc..78f76d99bd35 100644 --- a/drivers/rtc/rtc-pcf8563.c +++ b/drivers/rtc/rtc-pcf8563.c | |||
@@ -336,8 +336,8 @@ static int pcf8563_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *tm) | |||
336 | __func__, buf[0], buf[1], buf[2], buf[3]); | 336 | __func__, buf[0], buf[1], buf[2], buf[3]); |
337 | 337 | ||
338 | tm->time.tm_min = bcd2bin(buf[0] & 0x7F); | 338 | tm->time.tm_min = bcd2bin(buf[0] & 0x7F); |
339 | tm->time.tm_hour = bcd2bin(buf[1] & 0x7F); | 339 | tm->time.tm_hour = bcd2bin(buf[1] & 0x3F); |
340 | tm->time.tm_mday = bcd2bin(buf[2] & 0x1F); | 340 | tm->time.tm_mday = bcd2bin(buf[2] & 0x3F); |
341 | tm->time.tm_wday = bcd2bin(buf[3] & 0x7); | 341 | tm->time.tm_wday = bcd2bin(buf[3] & 0x7); |
342 | tm->time.tm_mon = -1; | 342 | tm->time.tm_mon = -1; |
343 | tm->time.tm_year = -1; | 343 | tm->time.tm_year = -1; |