diff options
| author | Dennis Cagle <d-cagle@codeaurora.org> | 2017-08-10 18:20:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-10 18:20:46 +0000 |
| commit | 1343f968473e677f2cab966423aa1dabc8fb4f0e (patch) | |
| tree | 91fa6a8d0d11b75542a7da1e046eb9cdce21fca6 | |
| parent | c8754a3110e0518dd605d795acab6f0b71757536 (diff) | |
| parent | 001c233ef677744ef42399227c6d25df5323e1d1 (diff) | |
| download | bullhead-1343f968473e677f2cab966423aa1dabc8fb4f0e.tar.gz | |
QCamera2/HAL3: correct mutex lock/unlock sequence am: c0610d4f9a am: f137d40cd7
am: 001c233ef6
Change-Id: Ia84ca8addf97c139371a3cefe67f92f8b509e44c
| -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; } } |