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);