]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
[AGPGART] Drop duplicate setting of info->mode in agp_copy_info()
authorDave Jones <davej@redhat.com>
Fri, 12 Aug 2005 03:28:56 +0000 (20:28 -0700)
committerDave Jones <davej@redhat.com>
Fri, 12 Aug 2005 03:28:56 +0000 (20:28 -0700)
Spotted by Jeremy Fitzhardinge, this change crept in with the multiple
backend support.  It's clearly incorrect to overwrite info->mode after
we just went to lengths to determine which bits to mask out.

Signed-off-by: Dave Jones <davej@redhat.com>
drivers/char/agp/generic.c

index f0079e991bdc4ffaf95c787e50bd9618a848e225..eb052427670b34668d5dce23786879b1382a5bc9 100644 (file)
@@ -319,7 +319,6 @@ int agp_copy_info(struct agp_bridge_data *bridge, struct agp_kern_info *info)
                info->mode = bridge->mode & ~AGP3_RESERVED_MASK;
        else
                info->mode = bridge->mode & ~AGP2_RESERVED_MASK;
-       info->mode = bridge->mode;
        info->aper_base = bridge->gart_bus_addr;
        info->aper_size = agp_return_size();
        info->max_memory = bridge->max_memory_agp;