Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge:
  powerpc: Use correct sequence for putting CPU into nap mode
  [PATCH] spufs: fix context-switch decrementer code
  [PATCH] powerpc32: Set cpu explicitly in kernel compiles
  [PATCH] powerpc/pseries: bugfix: balance calls to pci_device_put
  [PATCH] powerpc: Fix machine detection in prom_init.c
  [PATCH] ppc32: Fix string comparing in platform_notify_map
  [PATCH] powerpc: Avoid __initcall warnings
  [PATCH] powerpc: Ensure runlatch is off in the idle loop
  powerpc: Fix CHRP booting - needs a define_machine call
  powerpc: iSeries has only 256 IRQs

1 files changed, 5 insertions, 4 deletions

diff --git a/arch/ppc/syslib/ppc_sys.c b/arch/ppc/syslib/ppc_sys.c
index 60c724e11584..7662c4e6e7d6 100644
--- a/arch/ppc/syslib/ppc_sys.c
+++ b/arch/ppc/syslib/ppc_sys.c
@@ -156,12 +156,13 @@ void platform_notify_map(const struct platform_notify_dev_map *map,
         while (map->bus_id != NULL) {
                 idx = -1;
                 s = strrchr(dev->bus_id, '.');
-                if (s != NULL)
+                if (s != NULL) {
                         idx = (int)simple_strtol(s + 1, NULL, 10);
-                else
+                        len = s - dev->bus_id;
+                } else {
                         s = dev->bus_id;
-
-                len = s - dev->bus_id;
+                        len = strlen(dev->bus_id);
+                }
 
                 if (!strncmp(dev->bus_id, map->bus_id, len)) {
                         pdev = container_of(dev, struct platform_device, dev);