---

yaml --- r: 116616 b: refs/heads/master c: bbe5c78 h: refs/heads/master v: v3
git-mirror · Oct 14, 2008 · dd8f61b · dd8f61b
1 parent 25ef4b4
commit dd8f61b
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: 644f991d4b920ab1f5043509651479420b293490
+refs/heads/master: bbe5c7830c6dbde58726d44ec0337bc8b2d95d37
diff --git 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);