diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-22 10:15:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-22 10:15:05 -0800 |
| commit | 85ba70b6ceff7a2880f29b94e789cee436bc572f (patch) | |
| tree | db2028871e03e64390580c7a4c9cf8a5decffb3e | |
| parent | 8d86cf8879e374fb395f6b15150dd702275ca989 (diff) | |
| parent | 7b99f1aeed37196ad54099c30c2f154a7d6e91e0 (diff) | |
Merge tag 'pm-fixes-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixes from Rafael Wysocki:
"They fix one bug introduced recently, a build warning and a kerneldoc
function description.
Specifics:
- Prevent the acpi-cpufreq driver from crashing on exit by fixing a
check against the __cpuhp_setup_state() return value and fix the
kerneldoc description of that function to make it clear that it may
return positive numbers on success too (Boris Ostrovsky)
- Drop an incorrect __init annotation of a function in the s3c64xx
cpufreq driver and fix a build warning generated (by older
compilers) because of it (Arnd Bergmann)"
* tag 'pm-fixes-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
cpufreq: s3c64xx: remove incorrect __init annotation
cpufreq: Remove CPU hotplug callbacks only if they were initialized
CPU/hotplug: Clarify description of __cpuhp_setup_state() return value
| -rw-r--r-- | drivers/cpufreq/acpi-cpufreq.c | 2 | ||||
| -rw-r--r-- | drivers/cpufreq/s3c64xx-cpufreq.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c index 3a98702b7445..3a2ca0f79daf 100644 --- a/drivers/cpufreq/acpi-cpufreq.c +++ b/drivers/cpufreq/acpi-cpufreq.c @@ -930,7 +930,7 @@ static void __init acpi_cpufreq_boost_init(void) static void acpi_cpufreq_boost_exit(void) { - if (acpi_cpufreq_online >= 0) + if (acpi_cpufreq_online > 0) cpuhp_remove_state_nocalls(acpi_cpufreq_online); } diff --git a/drivers/cpufreq/s3c64xx-cpufreq.c b/drivers/cpufreq/s3c64xx-cpufreq.c index 176e84cc3991..0cb9040eca49 100644 --- a/drivers/cpufreq/s3c64xx-cpufreq.c +++ b/drivers/cpufreq/s3c64xx-cpufreq.c @@ -107,7 +107,7 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy, } #ifdef CONFIG_REGULATOR -static void __init s3c64xx_cpufreq_config_regulator(void) +static void s3c64xx_cpufreq_config_regulator(void) { int count, v, i, found; struct cpufreq_frequency_table *freq; |