1 files changed, 2 insertions, 8 deletions

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index a65c39c473bf..808be06bb67e 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -488,14 +488,8 @@ int __init of_scan_flat_dt(int (*it)(unsigned long node,
                 depth++;
                 pathp = (char *)p;
                 p = ALIGN(p + strlen(pathp) + 1, 4);
-                if ((*pathp) == '/') {
-                        const char *lp, *np;
-                        for (lp = NULL, np = pathp; *np; np++)
-                                if ((*np) == '/')
-                                        lp = np+1;
-                        if (lp != NULL)
-                                pathp = lp;
-                }
+                if (*pathp == '/')
+                        pathp = kbasename(pathp);
                 rc = it(p, pathp, depth, data);
                 if (rc != 0)
                         break;