diff options
| author | Rajendra Nayak <rnayak@ti.com> | 2010-03-31 04:16:30 -0600 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2010-03-31 04:16:30 -0600 |
| commit | 766d305fead341889e7b9611fdc97236075a29fb (patch) | |
| tree | e223fb6ed6b156a2e1e05c5e2e715c9d1a2b7816 /arch/arm/mach-omap2/prcm.c | |
| parent | 56dc79aba14bad1b73508df9e210e93bbd81a577 (diff) | |
| download | kernel_samsung_smdk4412-766d305fead341889e7b9611fdc97236075a29fb.zip kernel_samsung_smdk4412-766d305fead341889e7b9611fdc97236075a29fb.tar.gz kernel_samsung_smdk4412-766d305fead341889e7b9611fdc97236075a29fb.tar.bz2 | |
OMAP4: prcm: Use logical OR instead of bitwise OR
This patch fixes usage of bitwise OR in if conditions, and instead
uses logical OR.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Cc: Abhijit Pagare <abhijitpagare@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/prcm.c')
| -rw-r--r-- | arch/arm/mach-omap2/prcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c index 9537f6f..07a60f1 100644 --- a/arch/arm/mach-omap2/prcm.c +++ b/arch/arm/mach-omap2/prcm.c @@ -123,7 +123,7 @@ struct omap3_prcm_regs prcm_context; u32 omap_prcm_get_reset_sources(void) { /* XXX This presumably needs modification for 34XX */ - if (cpu_is_omap24xx() | cpu_is_omap34xx()) + if (cpu_is_omap24xx() || cpu_is_omap34xx()) return prm_read_mod_reg(WKUP_MOD, OMAP2_RM_RSTST) & 0x7f; if (cpu_is_omap44xx()) return prm_read_mod_reg(WKUP_MOD, OMAP4_RM_RSTST) & 0x7f; @@ -157,7 +157,7 @@ void omap_prcm_arch_reset(char mode, const char *cmd) else WARN_ON(1); - if (cpu_is_omap24xx() | cpu_is_omap34xx()) + if (cpu_is_omap24xx() || cpu_is_omap34xx()) prm_set_mod_reg_bits(OMAP_RST_DPLL3, prcm_offs, OMAP2_RM_RSTCTRL); if (cpu_is_omap44xx()) |