Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfcf3613 authored by Tom Cherry's avatar Tom Cherry Committed by Automerger Merge Worker
Browse files

Merge "Add AMBA bus support to platform devices" am: b88a97b4 am: 8edc5e44... 

Merge "Add AMBA bus support to platform devices" am: b88a97b4 am: 8edc5e44 am: 09100b7f am: 95305b52 am: 22db6016

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

Change-Id: I23d1e14024e4020c52156cedcdc17ff818c3d8e3
parents efe8b0cb 22db6016

init/devices.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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;