Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 10 insertions, 0 deletions

diff --git a/arch/ppc/syslib/prom_init.c b/arch/ppc/syslib/prom_init.c
index 2cee87137f2e..7f15136830f4 100644
--- a/arch/ppc/syslib/prom_init.c
+++ b/arch/ppc/syslib/prom_init.c
@@ -626,8 +626,18 @@ inspect_node(phandle node, struct device_node *dad,
         l = call_prom("package-to-path", 3, 1, node,
                       mem_start, mem_end - mem_start);
         if (l >= 0) {
+                char *p, *ep;
+
                 np->full_name = PTRUNRELOC((char *) mem_start);
                 *(char *)(mem_start + l) = 0;
+                /* Fixup an Apple bug where they have bogus \0 chars in the
+                 * middle of the path in some properties
+                 */
+                for (p = (char *)mem_start, ep = p + l; p < ep; p++)
+                        if ((*p) == '\0') {
+                                memmove(p, p+1, ep - p);
+                                ep--;
+                        }
                 mem_start = ALIGNUL(mem_start + l + 1);
         }