projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
[cascardo/linux.git]
/
kernel
/
trace
/
trace_functions.c
diff --git
a/kernel/trace/trace_functions.c
b/kernel/trace/trace_functions.c
index
7402144
..
75ef000
100644
(file)
--- 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 = {