Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 789d73b3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-fixes-4.4' of... 

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
parents d66e5139 62f49ee2

arch/arm/mach-exynos/pmu.c

+5 −1
Original line number Diff line number Diff line
@@ -748,8 +748,12 @@ static void exynos5_powerdown_conf(enum sys_powerdown mode) 
void exynos_sys_powerdown_conf(enum sys_powerdown mode)

{

	unsigned int i;

	const struct exynos_pmu_data *pmu_data;



	if (!pmu_context)

		return;



	const struct exynos_pmu_data *pmu_data = pmu_context->pmu_data;

	pmu_data = pmu_context->pmu_data;



	if (pmu_data->powerdown_conf)

		pmu_data->powerdown_conf(mode);

arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <plat/cpu.h>

#include <plat/cpu-freq-core.h>



static struct cpufreq_frequency_table s3c2440_plls_12[] __initdata = {

static struct cpufreq_frequency_table s3c2440_plls_12[] = {

	{ .frequency = 75000000,	.driver_data = PLLVAL(0x75, 3, 3),  }, 	/* FVco 600.000000 */

	{ .frequency = 80000000,	.driver_data = PLLVAL(0x98, 4, 3),  }, 	/* FVco 640.000000 */

	{ .frequency = 90000000,	.driver_data = PLLVAL(0x70, 2, 3),  }, 	/* FVco 720.000000 */

arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/cpufreq/s3c24xx-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -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;