1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c
index a1c3025f9df7..8300a9fcb80c 100644
--- a/drivers/cpufreq/cppc_cpufreq.c
+++ b/drivers/cpufreq/cppc_cpufreq.c
@@ -20,6 +20,7 @@
 #include <linux/cpu.h>
 #include <linux/cpufreq.h>
 #include <linux/dmi.h>
+#include <linux/time.h>
 #include <linux/vmalloc.h>
 
 #include <asm/unaligned.h>
@@ -162,6 +163,8 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
         policy->cpuinfo.max_freq = cppc_dmi_max_khz;
 
         policy->cpuinfo.transition_latency = cppc_get_transition_latency(cpu_num);
+        policy->transition_delay_us = cppc_get_transition_latency(cpu_num) /
+                NSEC_PER_USEC;
         policy->shared_type = cpu->shared_type;
 
         if (policy->shared_type == CPUFREQ_SHARED_TYPE_ANY)
@@ -230,8 +233,13 @@ static int __init cppc_cpufreq_init(void)
         return ret;
 
 out:
-        for_each_possible_cpu(i)
-                kfree(all_cpu_data[i]);
+        for_each_possible_cpu(i) {
+                cpu = all_cpu_data[i];
+                if (!cpu)
+                        break;
+                free_cpumask_var(cpu->shared_cpu_map);
+                kfree(cpu);
+        }
 
         kfree(all_cpu_data);
         return -ENODEV;