summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Cagle <d-cagle@codeaurora.org>2017-08-10 18:16:50 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-08-10 18:16:50 +0000
commite955646e0c44cd3d0ae26143ab3c44a53d6cc5fb (patch)
tree37502d015c3dd47e56ea94129a7cffbc714d5de4
parentcf3d22c34d396dbcb7b3fbc4481f7d94981d83c9 (diff)
parentf137d40cd705482ff5a137f4daedd81dfed32388 (diff)
downloadbullhead-e955646e0c44cd3d0ae26143ab3c44a53d6cc5fb.tar.gz
QCamera2/HAL3: correct mutex lock/unlock sequence am: c0610d4f9aoreo-dr1-dev
am: f137d40cd7 Change-Id: I0b6a6eadd785d7c29bd9e290c60d2be4c465c440
-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;
}
}