diff options
author | Dennis Cagle <d-cagle@codeaurora.org> | 2017-08-10 18:20:44 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-10 18:20:44 +0000 |
commit | 5e01984a0099bc1dbf982257fdd159b8c95e2f2d (patch) | |
tree | 3dd9a207ed79fcfaa6d1a4d547a9b48a8f21a1ef | |
parent | e2bd01a72c53d15fe143e5a1784da0b5314a94e5 (diff) | |
parent | e955646e0c44cd3d0ae26143ab3c44a53d6cc5fb (diff) | |
download | bullhead-5e01984a0099bc1dbf982257fdd159b8c95e2f2d.tar.gz |
QCamera2/HAL3: correct mutex lock/unlock sequence am: c0610d4f9a am: f137d40cd7
am: e955646e0c
Change-Id: I7f5f7bf6978045fa91ec79e2f00e37b773474a1c
-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; } } |