commit c66a6ba8df810ec90149d74e36a7a2193788f530
author android-build-team Robot <android-build-team-robot@google.com> Fri Oct 20 21:34:49 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Oct 20 21:34:49 2017 +0000
tree bf659e3a79da0f59f67084847dd1aebe3526bfea
parent 866ec4c2bd8f12aaea3538dd74a71a9972740eec
parent b092002c9425a1c2e4d91b656d8add354931e752

Snap for 4381952 from b092002c9425a1c2e4d91b656d8add354931e752 to oc-r6-release

Change-Id: Ie9e24222c76564abe890a25ccd5db01561e93c52

camera/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp
index f94d211..5f9f974 100644
--- a/camera/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp
@@ -1892,6 +1892,7 @@
                 newStream->max_buffers = MAX_INFLIGHT_REPROCESS_REQUESTS;
             } else {
                 ALOGE("%s: Error, Unknown stream type", __func__);
+                pthread_mutex_unlock(&mMutex);
                 return -EINVAL;
             }
 
@@ -3701,6 +3702,7 @@
             if(ADD_SET_PARAM_ENTRY_TO_BATCH(mParameters,
                 CAM_INTF_META_FRAME_NUMBER, request->frame_number)) {
                 ALOGE("%s: Failed to set the frame number in the parameters", __func__);
+                pthread_mutex_unlock(&mMutex);
                 return BAD_VALUE;
             }
         }