git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'debug/dma-api', 'arm/omap', 'arm/msm' and 'core' into api-2
[pandora-kernel.git]
/
drivers
/
cpuidle
/
governor.c
diff --git
a/drivers/cpuidle/governor.c
b/drivers/cpuidle/governor.c
index
724c164
..
ea2f8e7
100644
(file)
--- a/
drivers/cpuidle/governor.c
+++ b/
drivers/cpuidle/governor.c
@@
-81,6
+81,9
@@
int cpuidle_register_governor(struct cpuidle_governor *gov)
if (!gov || !gov->select)
return -EINVAL;
+ if (cpuidle_disabled())
+ return -ENODEV;
+
mutex_lock(&cpuidle_lock);
if (__cpuidle_find_governor(gov->name) == NULL) {
ret = 0;