diff options
| author | Vitaly Bordug <vbordug@ru.mvista.com> | 2006-04-03 15:26:32 +0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-04-13 09:30:19 -0700 |
| commit | 132058f78a1bc8cce2c5a40245365938d51832fe (patch) | |
| tree | f9bac73c83e10164a70e02c2360d3dd0815e5015 | |
| parent | 49c28e4e40be73019481f3c13a5966e0cc8f5a9d (diff) | |
[PATCH] ppc32: Fix string comparing in platform_notify_map
Fixed odd function behavior when dev->bus_id does not contain '.' - it
compared that case 0 characters of the string and hereby reported success and
executed callback. Now bus_id's are compared correctly, extra callback
triggering eliminated.
Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -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); |