From 35801b239a7fbf987380f2cbfb3c45a4204879cf Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Wed, 10 Aug 2011 20:44:21 +0000
Subject: [PATCH] --- yaml --- r: 274169 b: refs/heads/master c:
 6083184269fd723affca4f6340e491950267622a h: refs/heads/master i:   274167:
 d9d9432387c04466990c361fcca9f36816c90763 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/powerpc/mm/numa.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0fb908c2d07c..aa14d3531ce4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e377bc5d49fdbcb5f0e559b644d806a15454d407
+refs/heads/master: 6083184269fd723affca4f6340e491950267622a
diff --git a/trunk/arch/powerpc/mm/numa.c b/trunk/arch/powerpc/mm/numa.c
index 2164006fe170..2c1ae7a5fb53 100644
--- a/trunk/arch/powerpc/mm/numa.c
+++ b/trunk/arch/powerpc/mm/numa.c
@@ -1214,11 +1214,12 @@ int hot_add_node_scn_to_nid(unsigned long scn_addr)
 			break;
 		}
 
-		of_node_put(memory);
 		if (nid >= 0)
 			break;
 	}
 
+	of_node_put(memory);
+
 	return nid;
 }