summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrans Klaver <fransklaver@gmail.com>2015-09-01 13:59:25 -0700
committerTony Lindgren <tony@atomide.com>2015-09-01 13:59:25 -0700
commit05f4f1abc274ac7e8e83424d0cef2d842db91815 (patch)
treee9b7befcd98129c5fbca49eebcb57b555cd6c7a2
parent874b300a6a0bfe97225ed1f8648fa92238e4d9e9 (diff)
downloadop-kernel-dev-05f4f1abc274ac7e8e83424d0cef2d842db91815.zip
op-kernel-dev-05f4f1abc274ac7e8e83424d0cef2d842db91815.tar.gz
ARM: OMAP3: vc: fix 'or' always true warning
Fix the warning: arch/arm/mach-omap2/vc.c:302:47: warning: logical ‘or’ of collectively exhaustive tests is always true [-Wlogical-op] As we're toggling both CLKREQ and OFFMODE, we should also be checking OFFMODE. Signed-off-by: Frans Klaver <fransklaver@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/mach-omap2/vc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c
index e5a35f6..d44d311 100644
--- a/arch/arm/mach-omap2/vc.c
+++ b/arch/arm/mach-omap2/vc.c
@@ -300,7 +300,7 @@ static void __init omap3_vc_init_pmic_signaling(struct voltagedomain *voltdm)
val = voltdm->read(OMAP3_PRM_POLCTRL_OFFSET);
if (!(val & OMAP3430_PRM_POLCTRL_CLKREQ_POL) ||
- (val & OMAP3430_PRM_POLCTRL_CLKREQ_POL)) {
+ (val & OMAP3430_PRM_POLCTRL_OFFMODE_POL)) {
val |= OMAP3430_PRM_POLCTRL_CLKREQ_POL;
val &= ~OMAP3430_PRM_POLCTRL_OFFMODE_POL;
pr_debug("PM: fixing sys_clkreq and sys_off_mode polarity to 0x%x\n",
OpenPOWER on IntegriCloud