diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-12-11 00:19:37 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-11 00:19:37 +0100 |
commit | 789d73b384688898748da2d9a0e3683cb495b8a2 (patch) | |
tree | 64ee1fa87e36eaff077bd94614be57b220f331cc /arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c | |
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 'arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c b/arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c index 1191b2905625..be9a248b5ce9 100644 --- a/arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c +++ b/arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c @@ -20,7 +20,7 @@ #include <plat/cpu.h> #include <plat/cpu-freq-core.h> -static struct cpufreq_frequency_table s3c2440_plls_169344[] __initdata = { +static struct cpufreq_frequency_table s3c2440_plls_169344[] = { { .frequency = 78019200, .driver_data = PLLVAL(121, 5, 3), }, /* FVco 624.153600 */ { .frequency = 84067200, .driver_data = PLLVAL(131, 5, 3), }, /* FVco 672.537600 */ { .frequency = 90115200, .driver_data = PLLVAL(141, 5, 3), }, /* FVco 720.921600 */ |