1 files changed, 2 insertions, 2 deletions

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index b5673016089f..325a9b63265a 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -269,7 +269,7 @@ static void change_clocksource(void)
 
         new = clocksource_get_next();
 
-        if (clock == new)
+        if (!new || clock == new)
                 return;
 
         clocksource_forward_now();
@@ -446,7 +446,7 @@ void __init timekeeping_init(void)
 
         ntp_init();
 
-        clock = clocksource_get_next();
+        clock = clocksource_default_clock();
         if (clock->enable)
                 clock->enable(clock);
         /* set mult_orig on enable */