Merge branch 'fix/hda' into for-linus

[karo-tx-linux.git] / kernel / trace / trace_event_profile.c

diff --git a/kernel/trace/trace_event_profile.c b/kernel/trace/trace_event_profile.c
index 5b5895afecfe425f5c917af29b13d29ff4acf918..11ba5bb4ed0a71f0c3da5e8a2ce73471456aec47 100644 (file)
--- a/kernel/trace/trace_event_profile.c
+++ b/kernel/trace/trace_event_profile.c
@@ -14,7 +14,7 @@ int ftrace_profile_enable(int event_id)
 
        mutex_lock(&event_mutex);
        list_for_each_entry(event, &ftrace_events, list) {
-               if (event->id == event_id) {
+               if (event->id == event_id && event->profile_enable) {
                        ret = event->profile_enable(event);
                        break;
                }