diff options
author | Gleb Natapov <gleb@redhat.com> | 2013-10-17 16:04:47 +0200 |
---|---|---|
committer | Gleb Natapov <gleb@redhat.com> | 2013-10-17 16:41:49 +0200 |
commit | 13acfd5715144518232d8e29acf7c76ef1b089d8 (patch) | |
tree | 093c4311a737210bbdd3d1919f8193cb5f017241 /drivers/cpufreq/cpufreq.c | |
parent | Merge tag 'kvm-arm-for-3.13-1' of git://git.linaro.org/people/cdall/linux-kvm... (diff) | |
parent | Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux (diff) | |
download | linux-13acfd5715144518232d8e29acf7c76ef1b089d8.tar.xz linux-13acfd5715144518232d8e29acf7c76ef1b089d8.zip |
Powerpc KVM work is based on a commit after rc4.
Merging master into next to satisfy the dependencies.
Conflicts:
arch/arm/kvm/reset.c
Diffstat (limited to 'drivers/cpufreq/cpufreq.c')
-rw-r--r-- | drivers/cpufreq/cpufreq.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 89b3c52cd5c3..04548f7023af 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1460,6 +1460,9 @@ unsigned int cpufreq_get(unsigned int cpu) { unsigned int ret_freq = 0; + if (cpufreq_disabled() || !cpufreq_driver) + return -ENOENT; + if (!down_read_trylock(&cpufreq_rwsem)) return 0; |