[PATCH 3.16 019/129] ARM: s3c24xx: Fix boolean expressions in osiris_dvs_notify

[Ben Hutchings]

3.16.70-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: "Gustavo A. R. Silva" <gust...@embeddedor.com>

commit e2477233145f2156434afb799583bccd878f3e9f upstream.

Fix boolean expressions by using logical AND operator '&&' instead of
bitwise operator '&'.

This issue was detected with the help of Coccinelle.

Fixes: 4fa084af28ca ("ARM: OSIRIS: DVS (Dynamic Voltage Scaling) supoort.")
Signed-off-by: Gustavo A. R. Silva <gust...@embeddedor.com>
[krzk: Fix -Wparentheses warning]
Signed-off-by: Krzysztof Kozlowski <k...@kernel.org>
Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
---
 arch/arm/mach-s3c24xx/mach-osiris-dvs.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- a/arch/arm/mach-s3c24xx/mach-osiris-dvs.c
+++ b/arch/arm/mach-s3c24xx/mach-osiris-dvs.c
@@ -70,16 +70,16 @@ static int osiris_dvs_notify(struct noti
 
        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);