From: Dave Airlie <airlied@redhat.com>
Date: Tue, 21 Dec 2010 01:41:15 +0000 (+0000)
Subject: fb: fix overlapping test off-by-one.
X-Git-Tag: v2.6.37~30^2~2
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/mcf548x/linux.git/commitdiff_plain/acd0acb65ec907a9e872bbaa7ad811a518b49b45

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>
---

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 0e6aa3d96a42..4ac1201ad6c2 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;
 }