diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-02-15 17:43:29 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-02-15 20:38:16 +0100 |
| commit | 4f7df3cb5cdcb338486de234c6ed4c8c10be126a (patch) | |
| tree | b447ba54618b5ca02ad301e0f21d675d32a9e514 | |
| parent | cfe9930e9468e6fe871bca9a7db5c9e2ee10f6bb (diff) | |
| parent | 4bdf2f3f20a9de9b07f97907820c42f3a49ba63d (diff) | |
| download | linux-4f7df3cb5cdcb338486de234c6ed4c8c10be126a.tar.bz2 | |
Merge tag 'samsung-soc-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/fixes
Samsung mach/soc changes for v5.1
Two fixes: one for handling timeout while booting secondary CPU of
Exynos and second for S3C24xx DVS notifier.
* tag 'samsung-soc-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: exynos: Fix timeout when booting secondary CPUs
ARM: s3c24xx: Fix boolean expressions in osiris_dvs_notify
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/mach-exynos/platsmp.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-osiris-dvs.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c index c39ffd2e2fe6..b6da7edbbd2f 100644 --- a/arch/arm/mach-exynos/platsmp.c +++ b/arch/arm/mach-exynos/platsmp.c @@ -336,9 +336,9 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) /* wait max 10 ms until cpu1 is on */ while (exynos_cpu_power_state(core_id) != S5P_CORE_LOCAL_PWR_EN) { - if (timeout-- == 0) + if (timeout == 0) break; - + timeout--; mdelay(1); } diff --git a/arch/arm/mach-s3c24xx/mach-osiris-dvs.c b/arch/arm/mach-s3c24xx/mach-osiris-dvs.c index 058ce73137e8..5d819b6ea428 100644 --- a/arch/arm/mach-s3c24xx/mach-osiris-dvs.c +++ b/arch/arm/mach-s3c24xx/mach-osiris-dvs.c @@ -65,16 +65,16 @@ static int osiris_dvs_notify(struct notifier_block *nb, switch (val) { case CPUFREQ_PRECHANGE: - if (old_dvs & !new_dvs || - cur_dvs & !new_dvs) { + if ((old_dvs && !new_dvs) || + (cur_dvs && !new_dvs)) { pr_debug("%s: exiting dvs\n", __func__); cur_dvs = false; gpio_set_value(OSIRIS_GPIO_DVS, 1); } break; case CPUFREQ_POSTCHANGE: - if (!old_dvs & new_dvs || - !cur_dvs & new_dvs) { + if ((!old_dvs && new_dvs) || + (!cur_dvs && new_dvs)) { pr_debug("entering dvs\n"); cur_dvs = true; gpio_set_value(OSIRIS_GPIO_DVS, 0); |