diff options
author | Dave Jones <davej@redhat.com> | 2005-08-11 23:28:56 -0400 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2005-08-11 23:28:56 -0400 |
commit | 46acac3b4fd8ef66eec63b51de8d556a17c7d4f7 (patch) | |
tree | a4863a53d5964f8cf2d013c24294682c9bada198 /drivers | |
parent | 66bb8bf8b235ba4d37fda14375827864977c6a3e (diff) |
[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.c | 1 |
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) | |||
319 | info->mode = bridge->mode & ~AGP3_RESERVED_MASK; | 319 | info->mode = bridge->mode & ~AGP3_RESERVED_MASK; |
320 | else | 320 | else |
321 | info->mode = bridge->mode & ~AGP2_RESERVED_MASK; | 321 | info->mode = bridge->mode & ~AGP2_RESERVED_MASK; |
322 | info->mode = bridge->mode; | ||
323 | info->aper_base = bridge->gart_bus_addr; | 322 | info->aper_base = bridge->gart_bus_addr; |
324 | info->aper_size = agp_return_size(); | 323 | info->aper_size = agp_return_size(); |
325 | info->max_memory = bridge->max_memory_agp; | 324 | info->max_memory = bridge->max_memory_agp; |