commit e4b551336566bb4b0752bbe409ebb343f1cbbc08
author Linux Build Service Account <lnxbuild@localhost> Fri Jan 23 07:16:21 2015 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jan 23 07:16:21 2015 -0800
tree 92fd69549f8032d509a724343654212c69043635
parent 1bffa957664f57b3e31a027fdd93a63c15a2f535
parent 221bdb6f4ff92b0d8eb44200a44a731e3af90fa8

Merge "QCamera2: Increase map/unmap timeout to 1 sec."

QCamera2/stack/mm-camera-interface/src/mm_camera.c

diff --git a/QCamera2/stack/mm-camera-interface/src/mm_camera.c b/QCamera2/stack/mm-camera-interface/src/mm_camera.c
index 889d00d..2484be2 100644
--- a/QCamera2/stack/mm-camera-interface/src/mm_camera.c
+++ b/QCamera2/stack/mm-camera-interface/src/mm_camera.c
@@ -1629,9 +1629,19 @@
                                    uint32_t evt_mask,
                                    uint32_t *status)
 {
+    int rc = 0;
+    struct timespec ts;
+
     pthread_mutex_lock(&my_obj->evt_lock);
     while (!(my_obj->evt_rcvd.server_event_type & evt_mask)) {
-        pthread_cond_wait(&my_obj->evt_cond, &my_obj->evt_lock);
+        clock_gettime(CLOCK_REALTIME, &ts);
+        ts.tv_sec++;
+        rc = pthread_cond_timedwait(&my_obj->evt_cond, &my_obj->evt_lock, &ts);
+        if (rc == ETIMEDOUT) {
+            ALOGE("%s pthread_cond_timedwait success\n", __func__);
+            my_obj->evt_rcvd.status = MSM_CAMERA_STATUS_FAIL;
+            break;
+        }
     }
     *status = my_obj->evt_rcvd.status;
     /* reset local storage for recieved event for next event */