From 9ab92c1a39520d0791b4d3a0582f6b253dd4baf9 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 8 Dec 2009 15:58:08 +1000
Subject: [PATCH] --- yaml --- r: 174659 b: refs/heads/master c:
 ec42a6e7dcfc2e9a92fad1c132bc9e110fafeb3f h: refs/heads/master i:   174657:
 3ede63829b1e5658125c137b39ef606b850faabb   174655:
 fa3ae19710a6f8b05ef1968b256c78a373b63c2d v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/gpu/drm/ttm/ttm_memory.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ec5a0294ce07..509e37a1bfdf 100644
--- 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
index 8bfde5f40841..f5245c02b8fd 100644
--- 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