2 files changed, 4 insertions, 1 deletions

diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index 07756bddedef..fa8af4ebb1d6 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -727,7 +727,7 @@ static int __init cpufreq_gov_dbs_init(void)
                 dbs_tuners_ins.down_differential =
                                         MICRO_FREQUENCY_DOWN_DIFFERENTIAL;
                 /*
-                 * In no_hz/micro accounting case we set the minimum frequency
+                 * In nohz/micro accounting case we set the minimum frequency
                  * not depending on HZ, but fixed (very low). The deferred
                  * timer might skip some samples if idle/sleeping as needed.
                 */
diff --git a/drivers/cpufreq/pcc-cpufreq.c b/drivers/cpufreq/pcc-cpufreq.c
index 7b0603eb0129..cdc02ac8f41a 100644
--- a/drivers/cpufreq/pcc-cpufreq.c
+++ b/drivers/cpufreq/pcc-cpufreq.c
@@ -261,6 +261,9 @@ static int pcc_get_offset(int cpu)
         pr = per_cpu(processors, cpu);
         pcc_cpu_data = per_cpu_ptr(pcc_cpu_info, cpu);
 
+        if (!pr)
+                return -ENODEV;
+
         status = acpi_evaluate_object(pr->handle, "PCCP", NULL, &buffer);
         if (ACPI_FAILURE(status))
                 return -ENODEV;