From 9ed995239066fea0517f95f3e6c5a9b13805a217 Mon Sep 17 00:00:00 2001 From: Robert Reif Date: Tue, 9 Sep 2008 19:38:17 -0700 Subject: [PATCH] --- yaml --- r: 113112 b: refs/heads/master c: 833be4e1f080050706901d8605f2e9ee863464a9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-m48t59.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bc6058958cbf..cc1e7908f8ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 088a39623660f2875aaf15649bf663bbb5a8a219 +refs/heads/master: 833be4e1f080050706901d8605f2e9ee863464a9 diff --git a/trunk/drivers/rtc/rtc-m48t59.c b/trunk/drivers/rtc/rtc-m48t59.c index 761e9d7234fa..ce4eff6a8d51 100644 --- a/trunk/drivers/rtc/rtc-m48t59.c +++ b/trunk/drivers/rtc/rtc-m48t59.c @@ -82,7 +82,8 @@ static int m48t59_rtc_read_time(struct device *dev, struct rtc_time *tm) tm->tm_mday = BCD2BIN(M48T59_READ(M48T59_MDAY)); val = M48T59_READ(M48T59_WDAY); - if ((val & M48T59_WDAY_CEB) && (val & M48T59_WDAY_CB)) { + if ((pdata->type == M48T59RTC_TYPE_M48T59) && + (val & M48T59_WDAY_CEB) && (val & M48T59_WDAY_CB)) { dev_dbg(dev, "Century bit is enabled\n"); tm->tm_year += 100; /* one century */ }