From d16fe3a85aa128a93963c458f92966e708c4871f Mon Sep 17 00:00:00 2001
From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Sat, 14 Jul 2012 18:43:08 +0200
Subject: [PATCH] --- yaml --- r: 321343 b: refs/heads/master c:
 41fb433b63cc4745f4918fdaf295763da5ca826c h: refs/heads/master i:   321341:
 6685ce0184d737e68aaee16aba6d9de5ebc0907b   321339:
 09f06a277fd4bc1080d0822a4ecae742c1cb5b2e   321335:
 963684d6ac45a3962494953d28a5db17661e0f9d   321327:
 be1108c65886e1b61f76823689fab65cfe761e86   321311:
 461f436a06641345e76aebd6701ebb0811fb2cbd   321279:
 b0bd9101491a2a3866dc689450183afa9bff27a2 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/kernel/kdebugfs.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9c82565f46d0..412a87781128 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61b0fccd7f114573f973dfe25d864608822dc09e
+refs/heads/master: 41fb433b63cc4745f4918fdaf295763da5ca826c
diff --git a/trunk/arch/x86/kernel/kdebugfs.c b/trunk/arch/x86/kernel/kdebugfs.c
index 1d5d31ea686b..dc1404bf8e4b 100644
--- a/trunk/arch/x86/kernel/kdebugfs.c
+++ b/trunk/arch/x86/kernel/kdebugfs.c
@@ -107,7 +107,7 @@ static int __init create_setup_data_nodes(struct dentry *parent)
 {
 	struct setup_data_node *node;
 	struct setup_data *data;
-	int error = -ENOMEM;
+	int error;
 	struct dentry *d;
 	struct page *pg;
 	u64 pa_data;
@@ -121,8 +121,10 @@ static int __init create_setup_data_nodes(struct dentry *parent)
 
 	while (pa_data) {
 		node = kmalloc(sizeof(*node), GFP_KERNEL);
-		if (!node)
+		if (!node) {
+			error = -ENOMEM;
 			goto err_dir;
+		}
 
 		pg = pfn_to_page((pa_data+sizeof(*data)-1) >> PAGE_SHIFT);
 		if (PageHighMem(pg)) {