From 224634bcbce90ce0c6a7576d61e90ec2b7d6cc2d Mon Sep 17 00:00:00 2001
From: Vitaly Bordug <vbordug@ru.mvista.com>
Date: Mon, 3 Apr 2006 15:26:32 +0400
Subject: [PATCH] --- yaml --- r: 25871 b: refs/heads/master c:
 132058f78a1bc8cce2c5a40245365938d51832fe h: refs/heads/master i:   25869:
 d96fdf377caa11b71eecd4a03ef05d8637517b7b   25867:
 ca57c2cf652c6a314a784a765e851ed63542b47d   25863:
 ebb285787af7d7577bb1ad596886456b056fe189   25855:
 f6e42e6cb6a70d0d49e44260ece8e05b58e19a8b v: v3

---
 [refs]                          | 2 +-
 trunk/arch/ppc/syslib/ppc_sys.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c0403c08c490..42049be72b83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49c28e4e40be73019481f3c13a5966e0cc8f5a9d
+refs/heads/master: 132058f78a1bc8cce2c5a40245365938d51832fe
diff --git a/trunk/arch/ppc/syslib/ppc_sys.c b/trunk/arch/ppc/syslib/ppc_sys.c
index 60c724e11584..7662c4e6e7d6 100644
--- a/trunk/arch/ppc/syslib/ppc_sys.c
+++ b/trunk/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);