Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 274169
b: refs/heads/master
c: 6083184
h: refs/heads/master
i:
  274167: d9d9432
v: v3
  • Loading branch information
Anton Blanchard authored and Benjamin Herrenschmidt committed Sep 20, 2011
1 parent e0ad63d commit 35801b2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e377bc5d49fdbcb5f0e559b644d806a15454d407
refs/heads/master: 6083184269fd723affca4f6340e491950267622a
3 changes: 2 additions & 1 deletion trunk/arch/powerpc/mm/numa.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 35801b2

Please sign in to comment.