diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-18 10:34:24 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-18 10:34:24 -0700 |
commit | 6fbe85f914ad08cc43408a40ad18a561222e1b93 (patch) | |
tree | 320da01ba20dcbf6d31d80d35b1217193d663814 /arch/ppc | |
parent | a9a5cd5d2a57fb76dbae2115450f777b69beccf7 (diff) | |
parent | f39224a8c1828bdd327539da72a53d8a13595838 (diff) | |
download | linux-3.10-6fbe85f914ad08cc43408a40ad18a561222e1b93.tar.gz linux-3.10-6fbe85f914ad08cc43408a40ad18a561222e1b93.tar.bz2 linux-3.10-6fbe85f914ad08cc43408a40ad18a561222e1b93.zip |
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
Diffstat (limited to 'arch/ppc')
-rw-r--r-- | arch/ppc/syslib/ppc_sys.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/ppc/syslib/ppc_sys.c b/arch/ppc/syslib/ppc_sys.c index 60c724e1158..7662c4e6e7d 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); |