From 79d6c7d7642c832feeffefc4e68e58cf76e50ded Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Mon, 30 Jan 2012 16:30:12 -0200 Subject: [PATCH] libkmod-module: probe: remove useless flag to stop on failure We always want to stop if module failed to loaded due to unknown reason. --- libkmod/libkmod-module.c | 3 +-- libkmod/libkmod.h | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c index ff01cd89..7d4fbef9 100644 --- a/libkmod/libkmod-module.c +++ b/libkmod/libkmod-module.c @@ -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; } diff --git a/libkmod/libkmod.h b/libkmod/libkmod.h index 1873f1cc..525a87ff 100644 --- a/libkmod/libkmod.h +++ b/libkmod/libkmod.h @@ -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, }; /* -- 2.47.3