Merge back earlier 'pm-cpufreq' material.

diff --cc drivers/cpufreq/cpufreq.c
index 199b52b,571723b..2677ff1
--- 1/drivers/cpufreq/cpufreq.c
--- 2/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@@ -2143,10 -2148,15 +2148,15 @@@ int cpufreq_update_policy(unsigned int 
         * BIOS might change freq behind our back
         * -> ask driver for current freq and notify governors about a change
         */
 -      if (cpufreq_driver->get) {
 +      if (cpufreq_driver->get && !cpufreq_driver->setpolicy) {
                new_policy.cur = cpufreq_driver->get(cpu);
+               if (WARN_ON(!new_policy.cur)) {
+                       ret = -EIO;
+                       goto no_policy;
+               }
+ 
                if (!policy->cur) {
-                       pr_debug("Driver did not initialize current freq");
+                       pr_debug("Driver did not initialize current freq\n");
                        policy->cur = new_policy.cur;
                } else {
                        if (policy->cur != new_policy.cur && has_target())