summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorNicolas Kaiser <nikai@nikai.net>2010-10-05 20:31:54 +0200
committerTomi Valkeinen <tomi.valkeinen@nokia.com>2010-10-22 22:21:05 +0200
commite1a75a1aa11a4f48668ef295368ae1b65bd960c7 (patch)
tree5ad57185ec17ac8ae602661053c415c763ab3485 /arch/arm/plat-omap
parentOMAP: DSS2: DSI: Remove extra iounmap in error path (diff)
downloadlinux-e1a75a1aa11a4f48668ef295368ae1b65bd960c7.tar.xz
linux-e1a75a1aa11a4f48668ef295368ae1b65bd960c7.zip
arm/omap: simplify conditional
Simplify conditional: (a || (!a && !b)) => (a || !b) Signed-off-by: Nicolas Kaiser <nikai@nikai.net> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r--arch/arm/plat-omap/fb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c
index fffc1a0b78a7..f2a1483bdad9 100644
--- a/arch/arm/plat-omap/fb.c
+++ b/arch/arm/plat-omap/fb.c
@@ -126,7 +126,7 @@ static int set_fbmem_region_type(struct omapfb_mem_region *rg, int mem_type,
* type = 0 && paddr = 0, a default don't care case maps to
* the SDRAM type.
*/
- if (rg->type || (!rg->type && !rg->paddr))
+ if (rg->type || !rg->paddr)
return 0;
if (ranges_overlap(rg->paddr, rg->size, mem_start, mem_size)) {
rg->type = mem_type;