diff options
| author | Arnd Bergmann | 2015-12-11 00:19:37 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2015-12-11 00:19:37 +0100 |
| commit | 789d73b384688898748da2d9a0e3683cb495b8a2 (patch) | |
| tree | 64ee1fa87e36eaff077bd94614be57b220f331cc /drivers | |
| parent | d66e5139aee7d8379fc135b00b9ac7c66f9d4c74 (diff) | |
| parent | 62f49ee26f14753bd7fa634f51d537a79061bf0f (diff) | |
Merge tag 'samsung-fixes-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into fixes
Merge "Fixes for Exynos" from Krzysztof Kozlowski:
1. Fix potential NULL pointer dereference in Exynos PMU driver.
2. Remove incorrect __init annotation from s3c24xx cpufreq driver
structures.
* tag 'samsung-fixes-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
cpufreq: s3c24xx: Do not mark s3c2410_plls_add as __init
ARM: EXYNOS: Fix potential NULL pointer access in exynos_sys_powerdown_conf
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cpufreq/s3c24xx-cpufreq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/s3c24xx-cpufreq.c b/drivers/cpufreq/s3c24xx-cpufreq.c index 733aa5153e74..68ef8fd9482f 100644 --- a/drivers/cpufreq/s3c24xx-cpufreq.c +++ b/drivers/cpufreq/s3c24xx-cpufreq.c @@ -648,7 +648,7 @@ late_initcall(s3c_cpufreq_initcall); * * Register the given set of PLLs with the system. */ -int __init s3c_plltab_register(struct cpufreq_frequency_table *plls, +int s3c_plltab_register(struct cpufreq_frequency_table *plls, unsigned int plls_no) { struct cpufreq_frequency_table *vals; |