From: Dave Jones <davej@redhat.com>
Date: Fri, 12 Aug 2005 03:28:56 +0000 (-0700)
Subject: [AGPGART] Drop duplicate setting of info->mode in agp_copy_info()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=46acac3b4fd8ef66eec63b51de8d556a17c7d4f7;p=mv-sheeva.git

[AGPGART] Drop duplicate setting of info->mode in agp_copy_info()

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

diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index f0079e991bd..eb052427670 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -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;