diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2009-07-17 08:53:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2009-07-17 08:53:14 -0700 |
| commit | b983d0deb0e28f8880cdea79def575d96a27e603 (patch) | |
| tree | c1ae4f893647e2835e908717bf9073b8c7352a45 | |
| parent | tty_port: Fix return on interrupted use (diff) | |
| parent | tracing/function: Fix the return value of ftrace_trace_onoff_callback() (diff) | |
| download | linux-b983d0deb0e28f8880cdea79def575d96a27e603.tar.gz linux-b983d0deb0e28f8880cdea79def575d96a27e603.tar.bz2 linux-b983d0deb0e28f8880cdea79def575d96a27e603.zip | |
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()
| -rw-r--r-- | kernel/trace/trace_functions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c index 7402144bff21..75ef000613c3 100644 --- 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 = { |