From d6c447a445ee8d870f5d037bd21d786c2ea40c29 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Mon, 13 Feb 2012 16:54:18 +0100
Subject: [PATCH] Better estimate RTC offset right after trim

---
 rtc_linux.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rtc_linux.c b/rtc_linux.c
index aa172e1..2395bb8 100644
--- a/rtc_linux.c
+++ b/rtc_linux.c
@@ -1045,9 +1045,10 @@ RTC_Linux_Trim(void)
     n_samples = 0;
     operating_mode = OM_AFTERTRIM;
 
-    /* Zero the offset in case writertc is called or chronyd
+    /* Estimate the offset in case writertc is called or chronyd
        is terminated during rapid sampling */
-    coef_seconds_fast = 0.0;
+    coef_seconds_fast = -now.tv_usec / 1e6 + 0.5;
+    coef_ref_time = now;
 
     /* And start rapid sampling, interrupts on now */
     if (timeout_running) {