diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-22 01:45:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-22 01:45:47 +0000 |
| commit | 85e6e87c41bba51729cee8958a5c30157c8dc674 (patch) | |
| tree | c2a1d2f6aaf08d90b1efda93c66899b4f5add6af /services/audioflinger/FastMixer.cpp | |
| parent | 3b6da6bfb50a1c0324fb4c87326d3a477944d5fe (diff) | |
| parent | 22f22ffcb111b38eb7a303bfde39aed108b43e07 (diff) | |
| download | frameworks_av-85e6e87c41bba51729cee8958a5c30157c8dc674.zip frameworks_av-85e6e87c41bba51729cee8958a5c30157c8dc674.tar.gz frameworks_av-85e6e87c41bba51729cee8958a5c30157c8dc674.tar.bz2 | |
Merge "Restore accidentally-removed NULL timeout."
Diffstat (limited to 'services/audioflinger/FastMixer.cpp')
| -rw-r--r-- | services/audioflinger/FastMixer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audioflinger/FastMixer.cpp b/services/audioflinger/FastMixer.cpp index 3a3df54..eddde7e 100644 --- a/services/audioflinger/FastMixer.cpp +++ b/services/audioflinger/FastMixer.cpp @@ -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)) { |