summaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2013-09-11 14:24:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-11 15:58:58 -0700
commit1735be4b822e8e3808f461372ff3942824790172 (patch)
tree8600335734c78fd2560b54bc23983bd692cfd5ac /drivers/rtc
parent2cbc21877adf6adc69ca1fbc5fd1edbd7e1e3c59 (diff)
downloadop-kernel-dev-1735be4b822e8e3808f461372ff3942824790172.zip
op-kernel-dev-1735be4b822e8e3808f461372ff3942824790172.tar.gz
drivers/rtc/rtc-ds1742.c: report to RTC core if retrieved time is invalid
Let RTC core decide if the retrieved time is invalid, instead of processing errors in the driver. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Cc: Jingoo Han <jg1.han@samsung.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-ds1742.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c
index 139934f..17b73fd 100644
--- a/drivers/rtc/rtc-ds1742.c
+++ b/drivers/rtc/rtc-ds1742.c
@@ -115,11 +115,7 @@ static int ds1742_rtc_read_time(struct device *dev, struct rtc_time *tm)
/* year is 1900 + tm->tm_year */
tm->tm_year = bcd2bin(year) + bcd2bin(century) * 100 - 1900;
- if (rtc_valid_tm(tm) < 0) {
- dev_err(dev, "retrieved date/time is not valid.\n");
- rtc_time_to_tm(0, tm);
- }
- return 0;
+ return rtc_valid_tm(tm);
}
static const struct rtc_class_ops ds1742_rtc_ops = {
OpenPOWER on IntegriCloud