aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-09 14:01:42 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-09 14:01:42 -0800
commitcfd80652467717ca7346857d6d8c94503d74f3a3 (patch)
treeff4264e19c7b73b78fe45470830d4d4bd1442c0d /arch
parent687530b44de7e0fe70fabb4200d4cabce3af1a0c (diff)
parent1f858ef2fbabdc5e645644010a31a40c32e397c9 (diff)
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.
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c
index 4f6f679f279..4a5a42b842a 100644
--- a/arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c
+++ b/arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c
@@ -195,7 +195,7 @@ static unsigned int pcc_get_freq(unsigned int cpu)
cmd_incomplete:
iowrite16(0, &pcch_hdr->status);
spin_unlock(&pcc_lock);
- return -EINVAL;
+ return 0;
}
static int pcc_cpufreq_target(struct cpufreq_policy *policy,