redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

Merge branches 'pm-cpufreq' and 'pm-devfreq' 

* pm-cpufreq:
  acpi-cpufreq: De-register CPU notifier and free struct msr on error.

* pm-devfreq:
  PM / devfreq: Disable Exynos4 driver build on multiplatform
hifive-unleashed-5.1
Rafael J. Wysocki 2014-01-29 11:48:23 +01:00
parent 82e180598b eb8c68ef55 ba7abeb1ba
commit 88ea0f2c02
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/cpufreq/acpi-cpufreq.c
View File

@ -919,7 +919,7 @@ static void __init acpi_cpufreq_boost_init(void)
}
}
static void __exit acpi_cpufreq_boost_exit(void)
static void acpi_cpufreq_boost_exit(void)
{
if (msrs) {
unregister_cpu_notifier(&boost_nb);
@ -969,9 +969,10 @@ static int __init acpi_cpufreq_init(void)
acpi_cpufreq_boost_init();
ret = cpufreq_register_driver(&acpi_cpufreq_driver);
if (ret)
if (ret) {
free_acpi_perf_data();
acpi_cpufreq_boost_exit();
}
return ret;
}

2
drivers/devfreq/Kconfig
View File

@ -67,7 +67,7 @@ comment "DEVFREQ Drivers"
config ARM_EXYNOS4_BUS_DEVFREQ
bool "ARM Exynos4210/4212/4412 Memory Bus DEVFREQ Driver"
depends on CPU_EXYNOS4210 || SOC_EXYNOS4212 || SOC_EXYNOS4412
depends on (CPU_EXYNOS4210 || SOC_EXYNOS4212 || SOC_EXYNOS4412) && !ARCH_MULTIPLATFORM
select ARCH_HAS_OPP
select DEVFREQ_GOV_SIMPLE_ONDEMAND
help