1 files changed, 4 insertions, 2 deletions

diff --git a/kernel/relay.c b/kernel/relay.c
index 09ac2008f77b..8f2179c8056f 100644
--- a/kernel/relay.c
+++ b/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();
@@ -748,7 +750,7 @@ size_t relay_switch_subbuf(struct rchan_buf *buf, size_t length)
                          * from the scheduler (trying to re-grab
                          * rq->lock), so defer it.
                          */
-                        __mod_timer(&buf->timer, jiffies + 1);
+                        mod_timer(&buf->timer, jiffies + 1);
         }
 
         old = buf->data;