mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
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
This commit is contained in:
commit
6fbe85f914
22 changed files with 191 additions and 120 deletions
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue