2 files changed, 8 insertions, 8 deletions

diff --git a/kernel/trace/trace_entries.h b/kernel/trace/trace_entries.h
index e954ae3d82c0..e3a658bac10f 100644
--- a/kernel/trace/trace_entries.h
+++ b/kernel/trace/trace_entries.h
@@ -356,7 +356,7 @@ FTRACE_ENTRY(hwlat, hwlat_entry,
                 __field(        unsigned int,           seqnum          )
         ),
 
-        F_printk("cnt:%u\tts:%010llu.%010lu\tinner:%llu\touter:%llunmi-ts:%llu\tnmi-count:%u\n",
+        F_printk("cnt:%u\tts:%010llu.%010lu\tinner:%llu\touter:%llu\tnmi-ts:%llu\tnmi-count:%u\n",
                  __entry->seqnum,
                  __entry->tv_sec,
                  __entry->tv_nsec,
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index 9b4716bb8bb0..1f951b3df60c 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -1499,14 +1499,14 @@ static int process_preds(struct trace_event_call *call,
                 return ret;
         }
 
-        if (!nr_preds) {
-                prog = NULL;
-        } else {
-                prog = predicate_parse(filter_string, nr_parens, nr_preds,
+        if (!nr_preds)
+                return -EINVAL;
+
+        prog = predicate_parse(filter_string, nr_parens, nr_preds,
                                parse_pred, call, pe);
-                if (IS_ERR(prog))
-                        return PTR_ERR(prog);
-        }
+        if (IS_ERR(prog))
+                return PTR_ERR(prog);
+
         rcu_assign_pointer(filter->prog, prog);
         return 0;
 }