---

yaml --- r: 223015 b: refs/heads/master c: 136711b h: refs/heads/master i: 223013: f11fb16 223011: f4f7adf 223007: 7d831ec v: v3
git-mirror · Dec 5, 2010 · ab13e4d · ab13e4d
1 parent 747d814
commit ab13e4d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49078f7d108f132582e5af46304c317b55f83948
+refs/heads/master: 136711be41ec97f7f1a9c3a5e8535eb7da5fea59
diff --git a/trunk/drivers/char/agp/intel-gtt.c b/trunk/drivers/char/agp/intel-gtt.c
@@ -812,8 +812,10 @@ static int intel_fake_agp_fetch_size(void)
 
 static void i830_cleanup(void)
 {
-	kunmap(intel_private.i8xx_page);
-	intel_private.i8xx_flush_page = NULL;
+	if (intel_private.i8xx_flush_page) {
+		kunmap(intel_private.i8xx_flush_page);
+		intel_private.i8xx_flush_page = NULL;
+	}
 
 	__free_page(intel_private.i8xx_page);
 	intel_private.i8xx_page = NULL;