diff options
| author | Dennis Cagle <d-cagle@codeaurora.org> | 2017-08-03 15:23:53 -0700 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-23 00:00:16 +0000 |
| commit | ddb04b81864e5147dbfbb92f0f30f78057a1fb98 (patch) | |
| tree | 2e97915485da221018d261cacdbcb2821529733e | |
| parent | 7e2f63976e1f3edd9ffa2adfe98d9911c42fc987 (diff) | |
| download | bullhead-ddb04b81864e5147dbfbb92f0f30f78057a1fb98.tar.gz | |
QCamera2/HAL3: correct mutex lock/unlock sequence
Bug: 36716469
CRs-Fixed: 2053027
Change-Id: I6699c3682eec419fb6efb0583e9909e5739476a0
(cherry picked from commit a5eedde871c8e87784014e541c4aec247e954dc2)
(cherry picked from commit c0610d4f9af107a40b0f57c344e764d2abc84159)
| -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 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; } } |