diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-09-12 14:41:59 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-09-12 14:41:58 -0700 |
| commit | 14f6bfeeebb97c02cbf0c43818f7998e3bdb3cae (patch) | |
| tree | 055fbddd1e98f289dc9c65cb65a8e37fc2dbc151 /kernel/trace | |
| parent | 043f52c20a63011ae14175e56926076965d59353 (diff) | |
| parent | 03f50f905f9f7cadbb1b3cd82c078806bfd77703 (diff) | |
Merge "Merge android-4.4@610af85 (v4.4.85) into msm-4.4"
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace_events_filter.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c index 6816302542b2..f0e5408499b6 100644 --- a/kernel/trace/trace_events_filter.c +++ b/kernel/trace/trace_events_filter.c @@ -1979,6 +1979,10 @@ static int create_filter(struct trace_event_call *call, if (err && set_str) append_filter_err(ps, filter); } + if (err && !set_str) { + free_event_filter(filter); + filter = NULL; + } create_filter_finish(ps); *filterp = filter; |