Commit cfd80652 authored by Linus Torvalds's avatar Linus Torvalds

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] pcc-cpufreq: don't load driver if get_freq fails during init.
parents 687530b4 1f858ef2
...@@ -195,7 +195,7 @@ static unsigned int pcc_get_freq(unsigned int cpu) ...@@ -195,7 +195,7 @@ static unsigned int pcc_get_freq(unsigned int cpu)
cmd_incomplete: cmd_incomplete:
iowrite16(0, &pcch_hdr->status); iowrite16(0, &pcch_hdr->status);
spin_unlock(&pcc_lock); spin_unlock(&pcc_lock);
return -EINVAL; return 0;
} }
static int pcc_cpufreq_target(struct cpufreq_policy *policy, static int pcc_cpufreq_target(struct cpufreq_policy *policy,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment