Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 346404
b: refs/heads/master
c: f9a00e8
h: refs/heads/master
v: v3
  • Loading branch information
Andy Shevchenko authored and Linus Torvalds committed Dec 18, 2012
1 parent dd3c54a commit d706b38
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 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: 2fbc57c53a815ea30b926dd7627897a02daae302
refs/heads/master: f9a00e8738c209d95493cf97d3a82ab2655892e5
6 changes: 1 addition & 5 deletions trunk/fs/proc/proc_devtree.c
Original file line number Diff line number Diff line change
Expand Up @@ -195,11 +195,7 @@ void proc_device_tree_add_node(struct device_node *np,
set_node_proc_entry(np, de);
for (child = NULL; (child = of_get_next_child(np, child));) {
/* Use everything after the last slash, or the full name */
p = strrchr(child->full_name, '/');
if (!p)
p = child->full_name;
else
++p;
p = kbasename(child->full_name);

if (duplicate_name(de, p))
p = fixup_name(np, de, p);
Expand Down

0 comments on commit d706b38

Please sign in to comment.