commit ef3679a78ab52068ecab62a2363b40d37bc40577
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Apr 24 22:00:52 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 24 22:00:52 2024 +0000
tree fd62c4f16670216986aaadc492102ceb70759da2
parent d774ab22c1c3bb85dd947bccf0fa742e082378a0
parent 1db2d481eab6bba6ccbf853e46cea990c1600930

Merge "libmodprobe: remove dummy parameters for kernel" into main

libmodprobe/libmodprobe.cpp

diff --git a/libmodprobe/libmodprobe.cpp b/libmodprobe/libmodprobe.cpp
index 5023c79..1a40da1 100644
--- a/libmodprobe/libmodprobe.cpp
+++ b/libmodprobe/libmodprobe.cpp
@@ -484,7 +484,11 @@
                 return false;
             }
 
-            if (module_options_[cnd_last].find("load_sequential=1") != std::string::npos) {
+            std::string str = "load_sequential=1";
+            auto it = module_options_[cnd_last].find(str);
+            if (it != std::string::npos) {
+                module_options_[cnd_last].erase(it, it + str.size());
+
                 if (!LoadWithAliases(cnd_last, true)) {
                     return false;
                 }