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

Commit 5db9f436 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Kukjin Kim
Browse files

ARM: EXYNOS: handle properly the return values 



The cpuidle_register_driver return value is not checked.
The init function returns always -EIO when cpuidle_register_device
fails but the error could be different.

This patch fixes that by checking the cpuidle_register_driver properly
and returning the correct value when cpuidle_register_device fails.

Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: default avatarAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 2eb89f89

arch/arm/mach-exynos/cpuidle.c

+10 −5
Original line number Original line Diff line number Diff line
@@ -194,13 +194,17 @@ static void __init exynos5_core_down_clk(void) 




static int __init exynos4_init_cpuidle(void)

static int __init exynos4_init_cpuidle(void)

{

{

	int cpu_id;

	int cpu_id, ret;

	struct cpuidle_device *device;

	struct cpuidle_device *device;





	if (soc_is_exynos5250())

	if (soc_is_exynos5250())

		exynos5_core_down_clk();

		exynos5_core_down_clk();





	cpuidle_register_driver(&exynos4_idle_driver);

	ret = cpuidle_register_driver(&exynos4_idle_driver);

	if (ret) {

		printk(KERN_ERR "CPUidle failed to register driver\n");

		return ret;

	}





	for_each_cpu(cpu_id, cpu_online_mask) {

	for_each_cpu(cpu_id, cpu_online_mask) {

		device = &per_cpu(exynos4_cpuidle_device, cpu_id);

		device = &per_cpu(exynos4_cpuidle_device, cpu_id);
@@ -210,9 +214,10 @@ static int __init exynos4_init_cpuidle(void) 
		if (cpu_id != 0)

		if (cpu_id != 0)

			device->state_count = 1;

			device->state_count = 1;





		if (cpuidle_register_device(device)) {

		ret = cpuidle_register_device(device);

			printk(KERN_ERR "CPUidle register device failed\n,");

		if (ret) {

			return -EIO;

			printk(KERN_ERR "CPUidle register device failed\n");

			return ret;

		}

		}

	}

	}