commit b88a97b41ef29524cb3f9e30d21d32618069784e
author Tom Cherry <tomcherry@google.com> Tue Jul 07 15:14:14 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 07 15:14:14 2020 +0000
tree 1da08369e1cecb52f998859580b8b24dcfaa9440
parent 3d882d0536495205d9037d90bdff531854502738
parent d86300cc7e3697f831925ee67ba8936a17c747db

Merge "Add AMBA bus support to platform devices"

init/devices.cpp

diff --git a/init/devices.cpp b/init/devices.cpp
index 9fbec64..53ca875 100644
--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -193,7 +193,8 @@
     while (directory != "/" && directory != ".") {
         std::string subsystem_link_path;
         if (Realpath(directory + "/subsystem", &subsystem_link_path) &&
-            subsystem_link_path == sysfs_mount_point_ + "/bus/platform") {
+            (subsystem_link_path == sysfs_mount_point_ + "/bus/platform" ||
+             subsystem_link_path == sysfs_mount_point_ + "/bus/amba")) {
             // We need to remove the mount point that we added above before returning.
             directory.erase(0, sysfs_mount_point_.size());
             *platform_device_path = directory;