summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2005-08-12 05:28:56 +0200
committerDave Jones <davej@redhat.com>2005-08-12 05:28:56 +0200
commit46acac3b4fd8ef66eec63b51de8d556a17c7d4f7 (patch)
treea4863a53d5964f8cf2d013c24294682c9bada198 /drivers
parent[PATCH] Replace check_bridge_mode() with (bridge->mode & AGSTAT_MODE_3_0). (diff)
downloadlinux-46acac3b4fd8ef66eec63b51de8d556a17c7d4f7.tar.xz
linux-46acac3b4fd8ef66eec63b51de8d556a17c7d4f7.zip
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/agp/generic.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index f0079e991bdc..eb052427670b 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;