summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Cagle <d-cagle@codeaurora.org>2017-08-10 18:13:18 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-08-10 18:13:18 +0000
commitf137d40cd705482ff5a137f4daedd81dfed32388 (patch)
tree2e97915485da221018d261cacdbcb2821529733e
parent65904386a7408b0fee02084c9de23891f07df629 (diff)
parentc0610d4f9af107a40b0f57c344e764d2abc84159 (diff)
downloadbullhead-f137d40cd705482ff5a137f4daedd81dfed32388.tar.gz
QCamera2/HAL3: correct mutex lock/unlock sequence
am: c0610d4f9a Change-Id: I1d407758c588539599224591370d1cf2c12a454c
-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 f1311f2..58472c0 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;
}
}