diff --git a/[refs] b/[refs] index a3b13b72430f..56d615665af1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fdb6a8f4db813b4e50f4e975efe6be12ba5bf460 +refs/heads/master: b786c6a98ef6fa81114ba7b9fbfc0d67060775e3 diff --git a/trunk/kernel/relay.c b/trunk/kernel/relay.c index 09ac2008f77b..9d79b7854fa6 100644 --- a/trunk/kernel/relay.c +++ b/trunk/kernel/relay.c @@ -663,8 +663,10 @@ int relay_late_setup_files(struct rchan *chan, mutex_lock(&relay_channels_mutex); /* Is chan already set up? */ - if (unlikely(chan->has_base_filename)) + if (unlikely(chan->has_base_filename)) { + mutex_unlock(&relay_channels_mutex); return -EEXIST; + } chan->has_base_filename = 1; chan->parent = parent; curr_cpu = get_cpu();