diff options
author | Dennis Cagle <d-cagle@codeaurora.org> | 2017-08-10 18:20:27 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-10 18:20:27 +0000 |
commit | 869f4187a04d9e2d1d30df1de0821cac997dfde8 (patch) | |
tree | d50e2579ef6a69368cd88348c3149ed649a5e7ae | |
parent | 1dc3a4a8375ee52882b0494f5f7c7a6a866d9e5e (diff) | |
parent | f76f749034fdd8177187baab083c0d4b79cdcdb4 (diff) | |
download | angler-869f4187a04d9e2d1d30df1de0821cac997dfde8.tar.gz |
QCamera2/HAL3: correct mutex lock/unlock sequence am: e3620d0413 am: 7357ccc86c
am: f76f749034
Change-Id: I1445c6b50d8f809d31094c003f8fa2d90e590dd6
-rw-r--r-- | camera/QCamera2/HAL3/QCamera3HWI.cpp | 2 |
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; } } |