Mesa (master): egl/dri2: Don't check return result of mtx_unlock().

Matt Turner mattst88 at kemper.freedesktop.org
Wed May 18 18:07:07 UTC 2016


Module: Mesa
Branch: master
Commit: 53f64a84047b3f2766e490311c925a36afc64807
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=53f64a84047b3f2766e490311c925a36afc64807

Author: Matt Turner <mattst88 at gmail.com>
Date:   Mon May 16 14:43:26 2016 -0700

egl/dri2: Don't check return result of mtx_unlock().

Coverity (CID 1358496) warns that the cleanup code doesn't unlock the
mutex (which is arguably kind of stupid, since the only case that can
happen is when mtx_unlock() failed!). But, mtx_unlock() isn't going to
fail -- the mutex was locked by this thread just a few lines above it.

---

 src/egl/drivers/dri2/egl_dri2.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index d8448f4..65a3a62 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -2585,10 +2585,7 @@ dri2_client_wait_sync(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSync *sync,
 
          ret = cnd_wait(&dri2_sync->cond, &dri2_sync->mutex);
 
-         if (mtx_unlock(&dri2_sync->mutex)) {
-            ret = EGL_FALSE;
-            goto cleanup;
-         }
+         mtx_unlock(&dri2_sync->mutex);
 
          if (ret) {
             _eglError(EGL_BAD_PARAMETER, "eglClientWaitSyncKHR");
@@ -2619,10 +2616,7 @@ dri2_client_wait_sync(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSync *sync,
 
             ret = cnd_timedwait(&dri2_sync->cond, &dri2_sync->mutex, &expire);
 
-            if (mtx_unlock(&dri2_sync->mutex)) {
-               ret = EGL_FALSE;
-               goto cleanup;
-            }
+            mtx_unlock(&dri2_sync->mutex);
 
             if (ret)
                if (ret == thrd_busy) {




More information about the mesa-commit mailing list