diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 84a4114d2a7..d73f2074f23 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-08  Markus Metzger  <markus.t.metzger@intel.com>
+
+	* record-btrace.c (record_btrace_resume): Fix void return.
+
 2015-10-07  Yao Qi  <yao.qi@linaro.org>
 
 	* aarch64-tdep.c: Include opcode/aarch64.h.
diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
index a9eb7fe098b..3f068e2d890 100644
--- a/gdb/record-btrace.c
+++ b/gdb/record-btrace.c
@@ -1910,7 +1910,8 @@ record_btrace_resume (struct target_ops *ops, ptid_t ptid, int step,
       && !record_btrace_is_replaying (ops, minus_one_ptid))
     {
       ops = ops->beneath;
-      return ops->to_resume (ops, ptid, step, signal);
+      ops->to_resume (ops, ptid, step, signal);
+      return;
     }
 
   /* Compute the btrace thread flag for the requested move.  */