1 files changed, 9 insertions, 5 deletions

diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index ad63f30fe3da..a508388fb87c 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -774,6 +774,7 @@ void read_persistent_clock(struct timespec *ts)
         struct rtc_time tm;
         static int first = 1;
 
+        ts->tv_nsec = 0;
         /* XXX this is a litle fragile but will work okay in the short term */
         if (first) {
                 first = 0;
@@ -781,15 +782,18 @@ void read_persistent_clock(struct timespec *ts)
                         timezone_offset = ppc_md.time_init();
 
                 /* get_boot_time() isn't guaranteed to be safe to call late */
-                if (ppc_md.get_boot_time)
-                        return ppc_md.get_boot_time() -timezone_offset;
+                if (ppc_md.get_boot_time) {
+                        ts->tv_sec = ppc_md.get_boot_time() - timezone_offset;
+                        return;
+                }
+        }
+        if (!ppc_md.get_rtc_time) {
+                ts->tv_sec = 0;
+                return;
         }
-        if (!ppc_md.get_rtc_time)
-                return 0;
         ppc_md.get_rtc_time(&tm);
         ts->tv_sec = mktime(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday,
                             tm.tm_hour, tm.tm_min, tm.tm_sec);
-        ts->tv_nsec = 0;
 }
 
 /* clocksource code */