aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/fbmem.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-12-21 01:41:15 (GMT)
committerPaul Mundt <lethal@linux-sh.org>2010-12-24 03:33:55 (GMT)
commitacd0acb65ec907a9e872bbaa7ad811a518b49b45 (patch)
tree96d84ec98298e79efce95619a54f6676dea93702 /drivers/video/fbmem.c
parent8c1ac08b38af0c477ae32df9f4625b7dbddea1ea (diff)
fb: fix overlapping test off-by-one.
On my system with a radeon x2, the first GPU was not overlapping vesa but the test decided it was. Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Michel Dänzer <michel@daenzer.net> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/fbmem.c')
-rw-r--r--drivers/video/fbmem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 0e6aa3d..4ac1201 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1458,7 +1458,7 @@ static bool apertures_overlap(struct aperture *gen, struct aperture *hw)
if (gen->base == hw->base)
return true;
/* is the generic aperture base inside the hw base->hw base+size */
- if (gen->base > hw->base && gen->base <= hw->base + hw->size)
+ if (gen->base > hw->base && gen->base < hw->base + hw->size)
return true;
return false;
}

Privacy Policy