Merge pull request torvalds#472 from ddiss/lkl_show_config

lkl-config: fix lkl_show_config declaration
upa · Sep 17, 2019 · 1be6745 · 1be6745
2 parents 3738012 + 1fdcf7d
commit 1be6745
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/tools/lkl/include/lkl_config.h b/tools/lkl/include/lkl_config.h
@@ -52,7 +52,7 @@ struct lkl_config {
 
 int lkl_load_config_json(struct lkl_config *cfg, char *jstr);
 int lkl_load_config_env(struct lkl_config *cfg);
-void show_config(struct lkl_config *cfg);
+void lkl_show_config(struct lkl_config *cfg);
 int lkl_load_config_pre(struct lkl_config *cfg);
 int lkl_load_config_post(struct lkl_config *cfg);
 int lkl_unload_config(struct lkl_config *cfg);

diff --git a/tools/lkl/lib/config.c b/tools/lkl/lib/config.c
@@ -786,7 +786,6 @@ int lkl_unload_config(struct lkl_config *cfg)
 		}
 
 		lkl_clean_config(cfg);
-		free(cfg);
 	}
 
 	return 0;

diff --git a/tools/lkl/lib/hijack/init.c b/tools/lkl/lib/hijack/init.c
@@ -231,7 +231,11 @@ hijack_fini(void)
 			pause();
 	}
 
+	if (!cfg)
+		return;
+
 	lkl_unload_config(cfg);
+	free(cfg);
 
 	if (!lkl_running)
 		return;