diff --git a/[refs] b/[refs] index ac20ac34cb34..746badf93eab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4365a5676fa3aa1d5ae6c90c22a0044f09ba584e +refs/heads/master: f065f41f48569122b5bcddbd1ba2354f7cc29fdc diff --git a/trunk/kernel/time/timecompare.c b/trunk/kernel/time/timecompare.c index 96ff643a5a59..12f5c55090be 100644 --- a/trunk/kernel/time/timecompare.c +++ b/trunk/kernel/time/timecompare.c @@ -89,7 +89,7 @@ int timecompare_offset(struct timecompare *sync, * source time */ sample.offset = - ktime_to_ns(ktime_add(end, start)) / 2 - + (ktime_to_ns(end) + ktime_to_ns(start)) / 2 - ts; /* simple insertion sort based on duration */