[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH] Honor noprobe flag during DUD loading (#690058)



---
 loader/driverdisk.c |    4 ++--
 loader/loader.c     |    5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/loader/driverdisk.c b/loader/driverdisk.c
index d8a307c..69d7daf 100644
--- a/loader/driverdisk.c
+++ b/loader/driverdisk.c
@@ -597,7 +597,7 @@ int loadDriverFromMedia(int class, struct loaderData_s *loaderData,
             /* Unload all devices and load them again to use the updated modules */
             logMessage(INFO, "Trying to refresh loaded drivers");
             mlRestoreModuleState(moduleState);
-            busProbe(0);
+            busProbe(noprobe);
 
             /* Get info about modules after the update */
             postDDstate = mlVersions();
@@ -685,7 +685,7 @@ static void loadFromLocation(struct loaderData_s * loaderData, char * dir, GTree
     /* Unload all devices and load them again to use the updated modules */
     logMessage(INFO, "Trying to refresh loaded drivers");
     mlRestoreModuleState(moduleState);
-    busProbe(0);
+    busProbe(FL_NOPROBE(flags));
 }
 
 void getDDFromSource(struct loaderData_s * loaderData, char * src, GTree *moduleState) {
diff --git a/loader/loader.c b/loader/loader.c
index 37aa58e..c1ee607 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -1505,7 +1505,8 @@ static char *doLoaderMain(struct loaderData_s *loaderData,
                     break;
                 }
 
-                rc = loadDriverFromMedia(class, loaderData, 0, 0, NULL);
+                rc = loadDriverFromMedia(class, loaderData, 0,
+                                         FL_NOPROBE(flags), NULL);
                 if (rc == LOADER_BACK) {
                     step = STEP_DRIVER;
                     dir = -1;
@@ -2179,7 +2180,7 @@ int main(int argc, char ** argv) {
 
                 /* Unload all devices and load them again to use the updated modules */
                 mlRestoreModuleState(moduleState);
-                busProbe(0);
+                busProbe(FL_NOPROBE(flags));
             }
 
         ddcontinue:            
-- 
1.7.4.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]