]> git.ipfire.org Git - thirdparty/kmod.git/commitdiff
libkmod-module: probe: remove useless flag to stop on failure
authorLucas De Marchi <lucas.demarchi@profusion.mobi>
Mon, 30 Jan 2012 18:30:12 +0000 (16:30 -0200)
committerLucas De Marchi <lucas.demarchi@profusion.mobi>
Mon, 30 Jan 2012 22:05:34 +0000 (20:05 -0200)
We always want to stop if module failed to loaded due to unknown reason.

libkmod/libkmod-module.c
libkmod/libkmod.h

index ff01cd89fb419202ec5d8fef034ea2993f28541e..7d4fbef9f38f2bfb39489f1bf25e78f5240b10c4 100644 (file)
@@ -1199,8 +1199,7 @@ KMOD_EXPORT int kmod_module_probe_insert_module(struct kmod_module *mod,
                        break;
                }
 
-               if (err < 0 && err != -EEXIST &&
-                               (flags & KMOD_PROBE_STOP_ON_DEP_FAILURE))
+               if (err < 0 && err != -EEXIST)
                        break;
        }
 
index 1873f1cc25909050cddc248ada60148d0641f335..525a87ff262cd829e824f89cd9e063b5997131dd 100644 (file)
@@ -131,10 +131,9 @@ enum kmod_probe {
        /* codes below can be used in return value, too */
        KMOD_PROBE_APPLY_BLACKLIST_ALL = 0x04,
        KMOD_PROBE_APPLY_BLACKLIST = 0x08,
-       KMOD_PROBE_STOP_ON_DEP_FAILURE = 0x0F,
-       KMOD_PROBE_STOP_ON_COMMAND = 0x10,
-       KMOD_PROBE_IGNORE_COMMAND = 0x20,
-       KMOD_PROBE_STOP_ON_ALREADY_LOADED = 0x30,
+       KMOD_PROBE_STOP_ON_COMMAND = 0x0F,
+       KMOD_PROBE_IGNORE_COMMAND = 0x10,
+       KMOD_PROBE_STOP_ON_ALREADY_LOADED = 0x20,
 };
 
 /*