diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-06-14 14:10:08 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-06-14 14:10:08 +0200 |
| commit | cf230918cda19532e4a5cc4f0d5c82fa7e5e94f6 (patch) | |
| tree | 9eed06e09fbbe3764f47e4da7f8d15b5965f6cb3 /tools/perf/builtin-inject.c | |
| parent | 4cdf77a828b056258f48a9f6078bd2f77d9704bb (diff) | |
| parent | 4ba96195051be30160af6d5f5f83f9a055ab1f23 (diff) | |
| download | op-kernel-dev-cf230918cda19532e4a5cc4f0d5c82fa7e5e94f6.zip op-kernel-dev-cf230918cda19532e4a5cc4f0d5c82fa7e5e94f6.tar.gz | |
Merge branch 'perf/core' into perf/urgent, to pick up the latest fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-inject.c')
| -rw-r--r-- | tools/perf/builtin-inject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c index 6a3af00..16c7c11 100644 --- a/tools/perf/builtin-inject.c +++ b/tools/perf/builtin-inject.c @@ -72,7 +72,7 @@ static int perf_event__repipe_attr(struct perf_tool *tool, if (ret) return ret; - if (&inject->output.is_pipe) + if (!inject->output.is_pipe) return 0; return perf_event__repipe_synth(tool, event); |
