Merge "Add AMBA bus support to platform devices" am: b88a97b41e

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1353606

Change-Id: Ica4bcd2446da9e29a43c314d25185d1c856abcce
This commit is contained in:
Tom Cherry 2020-07-07 15:32:26 +00:00 committed by Automerger Merge Worker
commit 8edc5e449c

View file

@ -193,7 +193,8 @@ bool DeviceHandler::FindPlatformDevice(std::string path, std::string* platform_d
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;