drivers/rtc/rtc-s3c.c: fix failed first read of RTC time

Initialize the device time (if it is wrong) before registering RTC device
to fix following error message during rtc-s3c probe:

[    2.215414] rtc (null): read_time: fail to read
[    2.216322] s3c-rtc 10070000.rtc: rtc core: registered s3c as rtc1

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index fb0c569765c611b1b7ead2bd695d391618dbe883..a313b9b5a27e7edfab21381bcb2774e30bdfb9ed 100644 (file)
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -496,6 +496,22 @@ static int s3c_rtc_probe(struct platform_device *pdev)
 
        device_init_wakeup(&pdev->dev, 1);
 
+       /* Check RTC Time */
+       s3c_rtc_gettime(&pdev->dev, &rtc_tm);
+
+       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(&pdev->dev, &rtc_tm);
+
+               dev_warn(&pdev->dev, "warning: invalid RTC value so initializing it\n");
+       }
+
        /* register RTC and exit */
        info->rtc = devm_rtc_device_register(&pdev->dev, "s3c", &s3c_rtcops,
                                  THIS_MODULE);
@@ -519,22 +535,6 @@ static int s3c_rtc_probe(struct platform_device *pdev)
                goto err_nortc;
        }
 
-       /* Check RTC Time */
-       s3c_rtc_gettime(&pdev->dev, &rtc_tm);
-
-       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(&pdev->dev, &rtc_tm);
-
-               dev_warn(&pdev->dev, "warning: invalid RTC value so initializing it\n");
-       }
-
        if (info->data->select_tick_clk)
                info->data->select_tick_clk(info);