---

yaml --- r: 174659 b: refs/heads/master c: ec42a6e h: refs/heads/master i: 174657: 3ede638 174655: fa3ae19 v: v3
git-mirror · Dec 9, 2009 · 9ab92c1 · 9ab92c1
1 parent 5e6c15a
commit 9ab92c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b16d9acbdb97452d1418420e069acf7381ef10bb
+refs/heads/master: ec42a6e7dcfc2e9a92fad1c132bc9e110fafeb3f
diff --git a/trunk/drivers/gpu/drm/ttm/ttm_memory.c b/trunk/drivers/gpu/drm/ttm/ttm_memory.c
@@ -323,8 +323,10 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
 	 * No special dma32 zone needed.
 	 */
 
-	if (mem <= ((uint64_t) 1ULL << 32))
+	if (mem <= ((uint64_t) 1ULL << 32)) {
+		kfree(zone);
 		return 0;
+	}
 
 	/*
 	 * Limit max dma32 memory to 4GB for now