1 files changed, 14 insertions, 9 deletions

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 16d7b4ac94be..f13a663d1da5 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1016,15 +1016,17 @@ static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif,
         read_unlock_irqrestore(&cpufreq_driver_lock, flags);
 #endif
 
-        if (frozen)
-                /* Restore the saved policy when doing light-weight init */
-                policy = cpufreq_policy_restore(cpu);
-        else
+        /*
+         * Restore the saved policy when doing light-weight init and fall back
+         * to the full init if that fails.
+         */
+        policy = frozen ? cpufreq_policy_restore(cpu) : NULL;
+        if (!policy) {
+                frozen = false;
                 policy = cpufreq_policy_alloc();
-
-        if (!policy)
-                goto nomem_out;
-
+                if (!policy)
+                        goto nomem_out;
+        }
 
         /*
          * In the resume path, since we restore a saved policy, the assignment
@@ -1118,8 +1120,11 @@ err_get_freq:
         if (cpufreq_driver->exit)
                 cpufreq_driver->exit(policy);
 err_set_policy_cpu:
-        if (frozen)
+        if (frozen) {
+                /* Do not leave stale fallback data behind. */
+                per_cpu(cpufreq_cpu_data_fallback, cpu) = NULL;
                 cpufreq_policy_put_kobj(policy);
+        }
         cpufreq_policy_free(policy);
 
 nomem_out: