commit 8092e808a31839c502a52d391b15f31c1d8764f5
author Harsh Prateek Bora <harsh@linux.vnet.ibm.com> Fri May 24 12:52:17 2013 +0530
committer Steven Rostedt <rostedt@goodmis.org> Tue Jun 11 18:38:49 2013 -0400
tree 1ff012dac3fa01d07b6e9e51b026b877856bb176
parent 90e3c03c3a09a7b176b3fe59d78f5d9755ac8e37

tracing/trivial: Consolidate error return condition

Consolidate the checks for !enabled and !param to return -EINVAL
in event_enable_func().

Link: http://lkml.kernel.org/r/1369380137-12452-1-git-send-email-harsh@linux.vnet.ibm.com

Signed-off-by: Harsh Prateek Bora <harsh@linux.vnet.ibm.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

kernel/trace/trace_events.c

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 27963e2..db086f1 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -2011,10 +2011,7 @@
 	int ret;
 
 	/* hash funcs only work with set_ftrace_filter */
-	if (!enabled)
-		return -EINVAL;
-
-	if (!param)
+	if (!enabled || !param)
 		return -EINVAL;
 
 	system = strsep(&param, ":");