staging: greybus/timesync: avoid divide by zero on X86 Qemu
authorBryan O'Donoghue <pure.logic@nexus-software.ie>
Mon, 26 Sep 2016 17:01:23 +0000 (18:01 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 Sep 2016 10:59:51 +0000 (12:59 +0200)
A system configured without CONFIG_CPUFREQ will return 0 for cpufreq_get().
greybus-timesync can subsequently then do a divide-by-zero as result. This
patch fixes by checking for a zero return value from cpufreq_get() and
setting to a default value of 19.2MHz.

Reported-by: Rui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: Bryan O'Donoghue <pure.logic@nexus-software.ie>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/greybus/timesync_platform.c

index 50e8883f932f5bba82ac4cf41f2d4fe28f1d9f88..113f3d6c4b3a6cdeda3fce3abe729fbc927fd9d9 100644 (file)
@@ -20,6 +20,8 @@
 #include "greybus.h"
 #include "arche_platform.h"
 
+#define DEFAULT_FRAMETIME_CLOCK_HZ 19200000
+
 static u32 gb_timesync_clock_frequency;
 int (*arche_platform_change_state_cb)(enum arche_platform_state state,
                                      struct gb_timesync_svc *pdata);
@@ -32,8 +34,11 @@ u64 gb_timesync_platform_get_counter(void)
 
 u32 gb_timesync_platform_get_clock_rate(void)
 {
-       if (unlikely(!gb_timesync_clock_frequency))
-               return cpufreq_get(0);
+       if (unlikely(!gb_timesync_clock_frequency)) {
+               gb_timesync_clock_frequency = cpufreq_get(0);
+               if (!gb_timesync_clock_frequency)
+                       gb_timesync_clock_frequency = DEFAULT_FRAMETIME_CLOCK_HZ;
+       }
 
        return gb_timesync_clock_frequency;
 }