From 2e09525e6699a84153f9faa96d98dddfd3ea5d65 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Sat, 17 Jan 2009 12:04:36 +0100
Subject: [PATCH] --- yaml --- r: 129987 b: refs/heads/master c:
 b786c6a98ef6fa81114ba7b9fbfc0d67060775e3 h: refs/heads/master i:   129985:
 100e43ad734e2d3a38e63ba48cbe4e6408a97f1d   129983:
 52ef34b4261da95fdfa8040b37928ab576665b9b v: v3

---
 [refs]               | 2 +-
 trunk/kernel/relay.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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();