diff options
| author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2015-03-18 16:09:53 +0300 |
|---|---|---|
| committer | Kukjin Kim <kgene@kernel.org> | 2015-06-05 20:17:56 +0300 |
| commit | 9f294c178e03d824a89a85284b04c0770425de76 (patch) | |
| tree | ba5097593b50dc062be6443dbe932969e037bb7b | |
| parent | 29e5eea06bc19114b1df668f85b605914766a899 (diff) | |
| download | linux-9f294c178e03d824a89a85284b04c0770425de76.tar.xz | |
ARM: EXYNOS: fix exynos_boot_secondary() return value on timeout
exynos_boot_secondary() can erroneously return 0 or -ENOSYS even
when waiting on pen_release being set to -1 timeouts. Fix it by
adjusting ret variable value to -ETIMEDOUT when necessary.
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
| -rw-r--r-- | arch/arm/mach-exynos/platsmp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c index a825bca2a2b6..48f950d0b70e 100644 --- a/arch/arm/mach-exynos/platsmp.c +++ b/arch/arm/mach-exynos/platsmp.c @@ -337,6 +337,9 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) udelay(10); } + if (pen_release != -1) + ret = -ETIMEDOUT; + /* * now the secondary core is starting up let it run its * calibrations, then wait for it to finish |