Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: tracing/function: Fix the return value of ftrace_trace_onoff_callback()
16 years ago · b983d0deb0
parent ecc2e05e73 04aef32d39
commit b983d0deb0
1 changed files with 1 additions and 1 deletions
--- a/kernel/trace/trace_functions.c
+++ b/kernel/trace/trace_functions.c
@ -363,7 +363,7 @@ ftrace_trace_onoff_callback(char *glob, char *cmd, char *param, int enable)
 out_reg:
 	ret = register_ftrace_function_probe(glob, ops, count);

-	return ret;
+	return ret < 0 ? ret : 0;
 }

 static struct ftrace_func_command ftrace_traceon_cmd = {