projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'fixes', 'mmci' and 'sa11x0' into for-next
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
cpufreq
/
acpi-cpufreq.c
diff --git
a/drivers/cpufreq/acpi-cpufreq.c
b/drivers/cpufreq/acpi-cpufreq.c
index d2c3253e015ee23f107d2d34333c6afa533ab7cf..506fd23c755069f1f1b1e81763335f8f79b0de37 100644
(file)
--- a/
drivers/cpufreq/acpi-cpufreq.c
+++ b/
drivers/cpufreq/acpi-cpufreq.c
@@
-986,12
+986,12
@@
static int __init acpi_cpufreq_init(void)
{
int ret;
+ if (acpi_disabled)
+ return -ENODEV;
+
/* don't keep reloading if cpufreq_driver exists */
if (cpufreq_get_current_driver())
- return 0;
-
- if (acpi_disabled)
- return 0;
+ return -EEXIST;
pr_debug("acpi_cpufreq_init\n");