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; }