From 95a7799b47e396f9078eb74a3ea55d1dffd863a2 Mon Sep 17 00:00:00 2001 From: Masami Hiramatsu Date: Wed, 16 Sep 2009 11:42:55 -0400 Subject: [PATCH] --- yaml --- r: 169425 b: refs/heads/master c: 588bebb74fe87270f94c2810652bd683d63c4b54 h: refs/heads/master i: 169423: a2042a53b78e628f80ebd4ec02290d4d9b8cb3b4 v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_events.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fe9c5445ddf8..9c6b2d862843 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d5e067edc4635ff7515bfa9ab3edb38bc344cab +refs/heads/master: 588bebb74fe87270f94c2810652bd683d63c4b54 diff --git a/trunk/kernel/trace/trace_events.c b/trunk/kernel/trace/trace_events.c index ba3492076ab2..83cc2c01195d 100644 --- a/trunk/kernel/trace/trace_events.c +++ b/trunk/kernel/trace/trace_events.c @@ -1010,9 +1010,12 @@ static int __trace_add_event_call(struct ftrace_event_call *call) return -ENOENT; list_add(&call->list, &ftrace_events); - return event_create_dir(call, d_events, &ftrace_event_id_fops, + ret = event_create_dir(call, d_events, &ftrace_event_id_fops, &ftrace_enable_fops, &ftrace_event_filter_fops, &ftrace_event_format_fops); + if (ret < 0) + list_del(&call->list); + return ret; } /* Add an additional event_call dynamically */