From 9889d818b4719ee8865d031289714771d4ad38ba Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Sat, 16 Oct 2010 00:45:15 +0000 Subject: [PATCH] --- yaml --- r: 218276 b: refs/heads/master c: f6086134d0b17b2c37f537a5429a919b3d2cced8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/agp/amd-k7-agp.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f6439cd0577d..430bcaafbe7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 965d38074e6eae71757a8baf9a348139e1e6894d +refs/heads/master: f6086134d0b17b2c37f537a5429a919b3d2cced8 diff --git a/trunk/drivers/char/agp/amd-k7-agp.c b/trunk/drivers/char/agp/amd-k7-agp.c index b6b1568314c8..b1b4362bc648 100644 --- a/trunk/drivers/char/agp/amd-k7-agp.c +++ b/trunk/drivers/char/agp/amd-k7-agp.c @@ -309,7 +309,8 @@ static int amd_insert_memory(struct agp_memory *mem, off_t pg_start, int type) num_entries = A_SIZE_LVL2(agp_bridge->current_size)->num_entries; - if (type != 0 || mem->type != 0) + if (type != mem->type || + agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type)) return -EINVAL; if ((pg_start + mem->page_count) > num_entries) @@ -348,7 +349,8 @@ static int amd_remove_memory(struct agp_memory *mem, off_t pg_start, int type) unsigned long __iomem *cur_gatt; unsigned long addr; - if (type != 0 || mem->type != 0) + if (type != mem->type || + agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type)) return -EINVAL; for (i = pg_start; i < (mem->page_count + pg_start); i++) {