diff --git a/[refs] b/[refs] index 7c80dcd32b6e..9beb978dea7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07a267cdd2fd7d1de9455b1e36a1635ace7276c7 +refs/heads/master: d15f57f23eaba975309a153b23699cd0c0236974 diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index 3009aafa4dde..ea11f4ebfae1 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -964,8 +964,10 @@ static void *s_start(struct seq_file *m, loff_t *pos) mutex_lock(&trace_types_lock); - if (!current_trace || current_trace != iter->trace) + if (!current_trace || current_trace != iter->trace) { + mutex_unlock(&trace_types_lock); return NULL; + } atomic_inc(&trace_record_cmdline_disabled);