diff options
author | Nicolas Kaiser <nikai@nikai.net> | 2010-10-05 14:31:54 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-10-22 16:21:05 -0400 |
commit | e1a75a1aa11a4f48668ef295368ae1b65bd960c7 (patch) | |
tree | 5ad57185ec17ac8ae602661053c415c763ab3485 /arch/arm/plat-omap/fb.c | |
parent | e66345297d9ab3566eff0503d79eedda3c652428 (diff) |
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/fb.c')
-rw-r--r-- | arch/arm/plat-omap/fb.c | 2 |
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, | |||
126 | * type = 0 && paddr = 0, a default don't care case maps to | 126 | * type = 0 && paddr = 0, a default don't care case maps to |
127 | * the SDRAM type. | 127 | * the SDRAM type. |
128 | */ | 128 | */ |
129 | if (rg->type || (!rg->type && !rg->paddr)) | 129 | if (rg->type || !rg->paddr) |
130 | return 0; | 130 | return 0; |
131 | if (ranges_overlap(rg->paddr, rg->size, mem_start, mem_size)) { | 131 | if (ranges_overlap(rg->paddr, rg->size, mem_start, mem_size)) { |
132 | rg->type = mem_type; | 132 | rg->type = mem_type; |