Skip to content
Snippets Groups Projects
Commit d84247a4 authored by Matt Jordan's avatar Matt Jordan Committed by Gerrit Code Review
Browse files

Merge "res/res_corosync: Always decline module load, instead of failing" into 13

parents 399cd8bc a5e9c4e9
Branches
Tags
No related merge requests found
...@@ -863,7 +863,6 @@ static void cleanup_module(void) ...@@ -863,7 +863,6 @@ static void cleanup_module(void)
static int load_module(void) static int load_module(void)
{ {
cs_error_t cs_err; cs_error_t cs_err;
enum ast_module_load_result res = AST_MODULE_LOAD_FAILURE;
struct cpg_name name; struct cpg_name name;
corosync_aggregate_topic = stasis_topic_create("corosync_aggregate_topic"); corosync_aggregate_topic = stasis_topic_create("corosync_aggregate_topic");
...@@ -885,7 +884,6 @@ static int load_module(void) ...@@ -885,7 +884,6 @@ static int load_module(void)
if (load_config(0)) { if (load_config(0)) {
/* simply not configured is not a fatal error */ /* simply not configured is not a fatal error */
res = AST_MODULE_LOAD_DECLINE;
goto failed; goto failed;
} }
...@@ -926,7 +924,7 @@ static int load_module(void) ...@@ -926,7 +924,7 @@ static int load_module(void)
failed: failed:
cleanup_module(); cleanup_module();
return res; return AST_MODULE_LOAD_DECLINE;
} }
static int unload_module(void) static int unload_module(void)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment