Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] Fix format string bug.

diff --combined drivers/cpufreq/cpufreq.c
index 4e07d1f,cc3baf1..1d41496
--- 1/drivers/cpufreq/cpufreq.c
--- 2/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@@ -412,7 -412,7 +412,7 @@@ static int cpufreq_parse_governor(char 
                                int ret;
  
                                mutex_unlock(&cpufreq_governor_mutex);
-                               ret = request_module(name);
+                               ret = request_module("%s", name);
                                mutex_lock(&cpufreq_governor_mutex);
  
                                if (ret == 0)
@@@ -625,7 -625,7 +625,7 @@@ static ssize_t store_scaling_setspeed(s
        unsigned int freq = 0;
        unsigned int ret;
  
 -      if (!policy->governor->store_setspeed)
 +      if (!policy->governor || !policy->governor->store_setspeed)
                return -EINVAL;
  
        ret = sscanf(buf, "%u", &freq);
@@@ -639,7 -639,7 +639,7 @@@
  
  static ssize_t show_scaling_setspeed(struct cpufreq_policy *policy, char *buf)
  {
 -      if (!policy->governor->show_setspeed)
 +      if (!policy->governor || !policy->governor->show_setspeed)
                return sprintf(buf, "<unsupported>\n");
  
        return policy->governor->show_setspeed(policy, buf);