summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Cagle <d-cagle@codeaurora.org>2017-08-10 18:16:28 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-08-10 18:16:28 +0000
commitf76f749034fdd8177187baab083c0d4b79cdcdb4 (patch)
treeaaa5089863b018ab6e59851a256f0bb333ffa8b3
parentbbb205c01b50fae2866225e47482c874bfc36932 (diff)
parent7357ccc86c1fd0748faf35b8d3745d6981e5d276 (diff)
downloadangler-f76f749034fdd8177187baab083c0d4b79cdcdb4.tar.gz
QCamera2/HAL3: correct mutex lock/unlock sequence am: e3620d0413oreo-dr1-dev
am: 7357ccc86c Change-Id: Ib0064c9a5764732f5d0c3bfb450196ab794d1418
-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 1893800..febd972 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;
}
}