Skip to content

Commit

Permalink
[PATCH] ppc32: Fix string comparing in platform_notify_map
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Vitaly Bordug authored and Paul Mackerras committed Apr 13, 2006
1 parent 49c28e4 commit 132058f
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions arch/ppc/syslib/ppc_sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 132058f

Please sign in to comment.