1 files changed, 26 insertions, 18 deletions

diff --git a/arch/x86/platform/mrst/vrtc.c b/arch/x86/platform/mrst/vrtc.c
index 225bd0f0f675..d62b0a3b5c14 100644
--- a/arch/x86/platform/mrst/vrtc.c
+++ b/arch/x86/platform/mrst/vrtc.c
@@ -85,27 +85,35 @@ unsigned long vrtc_get_time(void)
         return mktime(year, mon, mday, hour, min, sec);
 }
 
-/* Only care about the minutes and seconds */
 int vrtc_set_mmss(unsigned long nowtime)
 {
-        int real_sec, real_min;
         unsigned long flags;
-        int vrtc_min;
-
-        spin_lock_irqsave(&rtc_lock, flags);
-        vrtc_min = vrtc_cmos_read(RTC_MINUTES);
-
-        real_sec = nowtime % 60;
-        real_min = nowtime / 60;
-        if (((abs(real_min - vrtc_min) + 15)/30) & 1)
-                real_min += 30;
-        real_min %= 60;
-
-        vrtc_cmos_write(real_sec, RTC_SECONDS);
-        vrtc_cmos_write(real_min, RTC_MINUTES);
-        spin_unlock_irqrestore(&rtc_lock, flags);
-
-        return 0;
+        struct rtc_time tm;
+        int year;
+        int retval = 0;
+
+        rtc_time_to_tm(nowtime, &tm);
+        if (!rtc_valid_tm(&tm) && tm.tm_year >= 72) {
+                /*
+                 * tm.year is the number of years since 1900, and the
+                 * vrtc need the years since 1972.
+                 */
+                year = tm.tm_year - 72;
+                spin_lock_irqsave(&rtc_lock, flags);
+                vrtc_cmos_write(year, RTC_YEAR);
+                vrtc_cmos_write(tm.tm_mon, RTC_MONTH);
+                vrtc_cmos_write(tm.tm_mday, RTC_DAY_OF_MONTH);
+                vrtc_cmos_write(tm.tm_hour, RTC_HOURS);
+                vrtc_cmos_write(tm.tm_min, RTC_MINUTES);
+                vrtc_cmos_write(tm.tm_sec, RTC_SECONDS);
+                spin_unlock_irqrestore(&rtc_lock, flags);
+        } else {
+                printk(KERN_ERR
+                       "%s: Invalid vRTC value: write of %lx to vRTC failed\n",
+                        __FUNCTION__, nowtime);
+                retval = -EINVAL;
+        }
+        return retval;
 }
 
 void __init mrst_rtc_init(void)