diff --git a/[refs] b/[refs] index a5949f36af75..9bb501eab487 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 478b7aab1682246a3d1e76e27a0aecb2f0013379 +refs/heads/master: c7986acba211e8285e14c9603fb89e6f4ea0b9f8 diff --git a/trunk/kernel/time/ntp.c b/trunk/kernel/time/ntp.c index 5202dde2f0af..580a35028693 100644 --- a/trunk/kernel/time/ntp.c +++ b/trunk/kernel/time/ntp.c @@ -141,10 +141,10 @@ static void ntp_update_offset(long offset) * Select how the frequency is to be controlled * and in which mode (PLL or FLL). */ - if (time_status & STA_FREQHOLD || time_reftime == 0) - time_reftime = xtime.tv_sec; - secs = xtime.tv_sec - time_reftime; + if (unlikely(time_status & STA_FREQHOLD || time_reftime == 0)) + secs = 0; + time_reftime = xtime.tv_sec; offset64 = offset;