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

Commit 649a6238 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libmodprobe: LPM: Cleanup of redundant check" am: a33362ed am: 23120dbe am: 779a196c 

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



Change-Id: Ia57e62f1d1031a2cbbc5cb88b9d2f3c68a841dbe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ca59aad0 779a196c

libmodprobe/libmodprobe.cpp

+2 −5
Original line number Diff line number Diff line
@@ -525,11 +525,8 @@ bool Modprobe::LoadModulesParallel(int num_threads) { 


        std::lock_guard guard(module_loaded_lock_);

        // Remove loaded module form mod_with_deps and soft dependencies of other modules

        for (const auto& module_loaded : module_loaded_) {

            if (mod_with_deps.find(module_loaded) != mod_with_deps.end()) {

        for (const auto& module_loaded : module_loaded_)

            mod_with_deps.erase(module_loaded);

            }

        }



        // Remove loaded module form dependencies of other modules which are not loaded yet

        for (const auto& module_loaded_path : module_loaded_paths_) {