summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-08-13 07:34:29 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-08-13 07:34:29 +0000
commitb9b8ea61d5f9583fe7660e7469f3acbcaaf194f5 (patch)
tree3dd9a207ed79fcfaa6d1a4d547a9b48a8f21a1ef
parent39a1dc130df902b0775c6e8a89b88d085a35e71a (diff)
parent5e01984a0099bc1dbf982257fdd159b8c95e2f2d (diff)
downloadbullhead-b9b8ea61d5f9583fe7660e7469f3acbcaaf194f5.tar.gz
release-request-68cc9b2a-98ae-4fbf-8b56-3e535855f399-for-git_oc-mr1-release-4269864 snap-temp-L25700000092502312
Change-Id: I46d3d77a3d9f7aee2919cd90f5d7aa197306057a
-rw-r--r--camera/QCamera2/HAL3/QCamera3HWI.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp
index 18a11ed..05c0c41 100644
--- a/camera/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp
@@ -1892,6 +1892,7 @@ int QCamera3HardwareInterface::configureStreamsPerfLocked(
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 @@ no_error:
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;
}
}