commit 2dda71085d0574bcb24b39f8f72d8b8457fce8f6
author Tom Cherry <tomcherry@google.com> Fri Apr 24 17:53:19 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 24 17:53:19 2015 +0000
tree 2be0e73e35ad4565ea48578a8fe1966a5b5ff2cc
parent 13233297dcd9d7007318519a2ab70296c50c1bc3
parent ed7c945f13ba663d6618b5bed9e9b72ee72838e6

am 92b82635: am 10936d1f: Merge "init: consider all platform devices for find_platform_device"

* commit '92b826357692988407018c5754584ef2da9e390e':
  init: consider all platform devices for find_platform_device

init/devices.cpp

diff --git a/init/devices.cpp b/init/devices.cpp
index 5ca855f..4944cec 100644
--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -266,7 +266,6 @@
 static void add_platform_device(const char *path)
 {
     int path_len = strlen(path);
-    struct listnode *node;
     struct platform_node *bus;
     const char *name = path;
 
@@ -276,15 +275,6 @@
             name += 9;
     }
 
-    list_for_each_reverse(node, &platform_names) {
-        bus = node_to_item(node, struct platform_node, list);
-        if ((bus->path_len < path_len) &&
-                (path[bus->path_len] == '/') &&
-                !strncmp(path, bus->path, bus->path_len))
-            /* subdevice of an existing platform, ignore it */
-            return;
-    }
-
     INFO("adding platform device %s (%s)\n", name, path);
 
     bus = (platform_node*) calloc(1, sizeof(struct platform_node));