1 files changed, 13 insertions, 5 deletions

diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index ead217b1857a..d0498a223f40 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -456,8 +456,8 @@ static int __devexit s3c_rtc_remove(struct platform_device *dev)
 static int __devinit s3c_rtc_probe(struct platform_device *pdev)
 {
         struct rtc_device *rtc;
+        struct rtc_time rtc_tm;
         struct resource *res;
-        unsigned int tmp, i;
         int ret;
 
         pr_debug("%s: probe=%p\n", __func__, pdev);
@@ -538,11 +538,19 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
 
         /* Check RTC Time */
 
-        for (i = S3C2410_RTCSEC; i <= S3C2410_RTCYEAR; i += 0x4) {
-                tmp = readb(s3c_rtc_base + i);
+        s3c_rtc_gettime(NULL, &rtc_tm);
 
-                if ((tmp & 0xf) > 0x9 || ((tmp >> 4) & 0xf) > 0x9)
-                        writeb(0, s3c_rtc_base + i);
+        if (rtc_valid_tm(&rtc_tm)) {
+                rtc_tm.tm_year  = 100;
+                rtc_tm.tm_mon   = 0;
+                rtc_tm.tm_mday  = 1;
+                rtc_tm.tm_hour  = 0;
+                rtc_tm.tm_min   = 0;
+                rtc_tm.tm_sec   = 0;
+
+                s3c_rtc_settime(NULL, &rtc_tm);
+
+                dev_warn(&pdev->dev, "warning: invalid RTC value so initializing it\n");
         }
 
         if (s3c_rtc_cpu_type == TYPE_S3C64XX)