From 4c282ad233f912ba79242aa4792b853340f01af2 Mon Sep 17 00:00:00 2001
From: Jim Cromie <jim.cromie@gmail.com>
Date: Fri, 27 Apr 2012 14:30:38 -0600
Subject: [PATCH] --- yaml --- r: 304055 b: refs/heads/master c:
 af442399fcf378a21ffe924b182f6d9ee70001ca h: refs/heads/master i:   304053:
 9820e1b6168e3a435137334c8c769927d7bb739b   304051:
 e13a0ac3877cb00eed284a3001ac1e9eb5e8c287   304047:
 4fc8530a84da64698c89187dc85299f212ba9fd3 v: v3

---
 [refs]                    |  2 +-
 trunk/lib/dynamic_debug.c | 19 ++++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index fb43d03810d1..c971b6e7f892 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ab676e96422f33a873006096f928feeded7ce3b
+refs/heads/master: af442399fcf378a21ffe924b182f6d9ee70001ca
diff --git a/trunk/lib/dynamic_debug.c b/trunk/lib/dynamic_debug.c
index 3b06f926d5b8..66e0ec4d21f7 100644
--- a/trunk/lib/dynamic_debug.c
+++ b/trunk/lib/dynamic_debug.c
@@ -984,7 +984,7 @@ static int __init dynamic_debug_init(void)
 		if (strcmp(modname, iter->modname)) {
 			ret = ddebug_add_module(iter_start, n, modname);
 			if (ret)
-				goto out_free;
+				goto out_err;
 			n = 0;
 			modname = iter->modname;
 			iter_start = iter;
@@ -993,9 +993,11 @@ static int __init dynamic_debug_init(void)
 	}
 	ret = ddebug_add_module(iter_start, n, modname);
 	if (ret)
-		goto out_free;
+		goto out_err;
 
-	/* ddebug_query boot param got passed -> set it up */
+	ddebug_init_success = 1;
+
+	/* apply ddebug_query boot param, dont unload tables on err */
 	if (ddebug_setup_string[0] != '\0') {
 		pr_warn("ddebug_query param name is deprecated,"
 			" change it to dyndbg\n");
@@ -1005,9 +1007,6 @@ static int __init dynamic_debug_init(void)
 				ddebug_setup_string);
 		else
 			pr_info("%d changes by ddebug_query\n", ret);
-
-		/* keep tables even on ddebug_query parse error */
-		ret = 0;
 	}
 	/* now that ddebug tables are loaded, process all boot args
 	 * again to find and activate queries given in dyndbg params.
@@ -1021,12 +1020,10 @@ static int __init dynamic_debug_init(void)
 	parse_args("dyndbg params", cmdline, NULL,
 		   0, 0, 0, &ddebug_dyndbg_boot_param_cb);
 	kfree(cmdline);
+	return 0;
 
-out_free:
-	if (ret)
-		ddebug_remove_all_tables();
-	else
-		ddebug_init_success = 1;
+out_err:
+	ddebug_remove_all_tables();
 	return 0;
 }
 /* Allow early initialization for boot messages via boot param */