From dd8f61b66fc023f57e0c2513f510b4145f3d4a80 Mon Sep 17 00:00:00 2001
From: Pekka Paalanen <pq@iki.fi>
Date: Tue, 16 Sep 2008 21:54:16 +0300
Subject: [PATCH] --- yaml --- r: 116616 b: refs/heads/master c:
 bbe5c7830c6dbde58726d44ec0337bc8b2d95d37 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/mm/mmio-mod.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 805e71f62b94..8edb0ace6831 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 644f991d4b920ab1f5043509651479420b293490
+refs/heads/master: bbe5c7830c6dbde58726d44ec0337bc8b2d95d37
diff --git a/trunk/arch/x86/mm/mmio-mod.c b/trunk/arch/x86/mm/mmio-mod.c
index 635b50e85581..754bd1eaf4f6 100644
--- a/trunk/arch/x86/mm/mmio-mod.c
+++ b/trunk/arch/x86/mm/mmio-mod.c
@@ -307,8 +307,10 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
 	map.map_id = trace->id;
 
 	spin_lock_irq(&trace_lock);
-	if (!is_enabled())
+	if (!is_enabled()) {
+		kfree(trace);
 		goto not_enabled;
+	}
 
 	mmio_trace_mapping(&map);
 	list_add_tail(&trace->list, &trace_list);