From b55737f2fa96399a225c0009f8a930bc5dc7da0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89meric=20Maschino?= Date: Tue, 23 Aug 2011 21:48:23 +0200 Subject: [PATCH] --- yaml --- r: 273281 b: refs/heads/master c: fc000154d7a63dee209aab1c13f2c19abdcf6b59 h: refs/heads/master i: 273279: 902cdb2fdffee465e21bc0f6124e4fa9c88a88ae v: v3 --- [refs] | 2 +- trunk/drivers/char/agp/hp-agp.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 81042ac60b26..0ca6b29b8df6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5d4e02874537d65ed2f431d39bf2f6d2967bd1b +refs/heads/master: fc000154d7a63dee209aab1c13f2c19abdcf6b59 diff --git a/trunk/drivers/char/agp/hp-agp.c b/trunk/drivers/char/agp/hp-agp.c index 056b289a1e89..3695773ce7c3 100644 --- a/trunk/drivers/char/agp/hp-agp.c +++ b/trunk/drivers/char/agp/hp-agp.c @@ -336,7 +336,8 @@ hp_zx1_insert_memory (struct agp_memory *mem, off_t pg_start, int type) off_t j, io_pg_start; int io_pg_count; - if (type != 0 || mem->type != 0) { + if (type != mem->type || + agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type)) { return -EINVAL; } @@ -380,7 +381,8 @@ hp_zx1_remove_memory (struct agp_memory *mem, off_t pg_start, int type) struct _hp_private *hp = &hp_private; int i, io_pg_start, io_pg_count; - if (type != 0 || mem->type != 0) { + if (type != mem->type || + agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type)) { return -EINVAL; }