diff --git a/ChangeLog b/ChangeLog
index a7bffa66a0..b8e1467819 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Mar 22 10:24:04 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* time.c (divmodv): void function never returns any value.
+
 Tue Mar 22 10:11:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/lib/test/unit.rb (Test::Unit::StatusLine#failed): print
diff --git a/time.c b/time.c
index 2ee592d417..2b37bdef71 100644
--- a/time.c
+++ b/time.c
@@ -148,7 +148,10 @@ divmodv(VALUE n, VALUE d, VALUE *q, VALUE *r)
     VALUE tmp, ary;
     if (FIXNUM_P(d)) {
 	if (FIX2LONG(d) == 0) rb_num_zerodiv();
-	if (FIXNUM_P(n)) return rb_fix_divmod_fix(n, d, q, r);
+	if (FIXNUM_P(n)) {
+	    rb_fix_divmod_fix(n, d, q, r);
+	    return;
+	}
     }
     tmp = rb_funcall(n, id_divmod, 1, d);
     ary = rb_check_array_type(tmp);