Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58c26d95 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 9a59d411: am 85e6e87c: Merge "Restore accidentally-removed NULL timeout."

* commit '9a59d411':
  Restore accidentally-removed NULL timeout.
parents c0bf836f 9a59d411
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ bool FastMixer::threadLoop()
                ALOG_ASSERT(coldFutexAddr != NULL);
                int32_t old = android_atomic_dec(coldFutexAddr);
                if (old <= 0) {
                    (void) syscall(__NR_futex, coldFutexAddr, FUTEX_WAIT_PRIVATE, old - 1);
                    (void) syscall(__NR_futex, coldFutexAddr, FUTEX_WAIT_PRIVATE, old - 1, NULL);
                }
                int policy = sched_getscheduler(0);
                if (!(policy == SCHED_FIFO || policy == SCHED_RR)) {