commit 49570ff4d910f11b03a53471d2615a09aa4524d7
author Sungtak Lee <taklee@google.com> Sat Mar 26 08:57:36 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 26 08:57:36 2022 +0000
tree 2ac74b95ab78af54f762526a7178aed1249612ec
parent 830aea3c0ebd8104868cc7461ebfc7977f7af910
parent 2d407c1e1429a3a028039d222d4f356b1aa003b7

Merge "Codec2: Check errno during syscall (FUTEX_WAIT) failure in fence.wait"

media/codec2/vndk/platform/C2SurfaceSyncObj.cpp

diff --git a/media/codec2/vndk/platform/C2SurfaceSyncObj.cpp b/media/codec2/vndk/platform/C2SurfaceSyncObj.cpp
index e55bdc0..2115cc3 100644
--- a/media/codec2/vndk/platform/C2SurfaceSyncObj.cpp
+++ b/media/codec2/vndk/platform/C2SurfaceSyncObj.cpp
@@ -228,10 +228,10 @@
     tv.tv_nsec = timeoutNs % 1000000000;
 
     int ret =  syscall(__NR_futex, &mCond, FUTEX_WAIT, waitId, &tv, NULL, 0);
-    if (ret == 0 || ret == EAGAIN) {
+    if (ret == 0 || errno == EAGAIN) {
         return C2_OK;
     }
-    if (ret == EINTR || ret == ETIMEDOUT) {
+    if (errno == EINTR || errno == ETIMEDOUT) {
         return C2_TIMED_OUT;
     }
     return C2_BAD_VALUE;