]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
fb: fix overlapping test off-by-one.
authorDave Airlie <airlied@redhat.com>
Tue, 21 Dec 2010 01:41:15 +0000 (01:41 +0000)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 24 Dec 2010 03:33:55 +0000 (12:33 +0900)
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>
drivers/video/fbmem.c

index 0e6aa3d96a4246f7c05b0274a2295a3275d6d2ac..4ac1201ad6c2fb3229a60e1377f29b4eef78a2eb 100644 (file)
@@ -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)
                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;
 }
                return true;
        return false;
 }