提交 8e8ccb29 编写于 作者: G Gustavo A. R. Silva 提交者: Xie XiuQi

ARM: s3c24xx: Fix boolean expressions in osiris_dvs_notify

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: 4fa084af ("ARM: OSIRIS: DVS (Dynamic Voltage Scaling) supoort.")
Cc: stable@vger.kernel.org
Signed-off-by: NGustavo A. R. Silva <gustavo@embeddedor.com>
[krzk: Fix -Wparentheses warning]
Signed-off-by: NKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 67d5ddc3
...@@ -65,16 +65,16 @@ static int osiris_dvs_notify(struct notifier_block *nb, ...@@ -65,16 +65,16 @@ static int osiris_dvs_notify(struct notifier_block *nb,
switch (val) { switch (val) {
case CPUFREQ_PRECHANGE: case CPUFREQ_PRECHANGE:
if (old_dvs & !new_dvs || if ((old_dvs && !new_dvs) ||
cur_dvs & !new_dvs) { (cur_dvs && !new_dvs)) {
pr_debug("%s: exiting dvs\n", __func__); pr_debug("%s: exiting dvs\n", __func__);
cur_dvs = false; cur_dvs = false;
gpio_set_value(OSIRIS_GPIO_DVS, 1); gpio_set_value(OSIRIS_GPIO_DVS, 1);
} }
break; break;
case CPUFREQ_POSTCHANGE: case CPUFREQ_POSTCHANGE:
if (!old_dvs & new_dvs || if ((!old_dvs && new_dvs) ||
!cur_dvs & new_dvs) { (!cur_dvs && new_dvs)) {
pr_debug("entering dvs\n"); pr_debug("entering dvs\n");
cur_dvs = true; cur_dvs = true;
gpio_set_value(OSIRIS_GPIO_DVS, 0); gpio_set_value(OSIRIS_GPIO_DVS, 0);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册