Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[sfrench/cifs-2.6.git] / arch / nios2 / kernel / time.c

diff --git a/arch/nios2/kernel/time.c b/arch/nios2/kernel/time.c
index 645129aaa9a016b5e91b2ebc6e42e241ee00f72d..20e86209ef2e03646b49dd1f00324dae0ecedf72 100644 (file)
--- a/arch/nios2/kernel/time.c
+++ b/arch/nios2/kernel/time.c
@@ -107,7 +107,10 @@ static struct nios2_clocksource nios2_cs = {
 
 cycles_t get_cycles(void)
 {
-       return nios2_timer_read(&nios2_cs.cs);
+       /* Only read timer if it has been initialized */
+       if (nios2_cs.timer.base)
+               return nios2_timer_read(&nios2_cs.cs);
+       return 0;
 }
 EXPORT_SYMBOL(get_cycles);