diff options
author | Dennis Cagle <d-cagle@codeaurora.org> | 2017-08-10 18:16:48 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-10 18:16:48 +0000 |
commit | 001c233ef677744ef42399227c6d25df5323e1d1 (patch) | |
tree | f99bf2bd092a17b402bcd17ab4530dd83896abf9 | |
parent | f39e280dbabc9fd88cfd3fa874f933600d4dd214 (diff) | |
parent | f137d40cd705482ff5a137f4daedd81dfed32388 (diff) | |
download | bullhead-001c233ef677744ef42399227c6d25df5323e1d1.tar.gz |
QCamera2/HAL3: correct mutex lock/unlock sequence am: c0610d4f9a
am: f137d40cd7
Change-Id: Id9291c92d5f9bd52f79a2ff9574035070c6f03c2
-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 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; } } |