Signed-off-by: Andy Shevchenko <andriy.shevche...@linux.intel.com>
---
 fs/proc/proc_devtree.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
index df7dd08..3d9fd66 100644
--- a/fs/proc/proc_devtree.c
+++ b/fs/proc/proc_devtree.c
@@ -13,6 +13,7 @@
 #include <linux/of.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/string.h>
 #include <asm/prom.h>
 #include <asm/uaccess.h>
 #include "internal.h"
@@ -195,11 +196,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);
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to