summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
Diffstat (limited to 'camera')
-rw-r--r--camera/OMXCameraAdapter/OMXCapture.cpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/camera/OMXCameraAdapter/OMXCapture.cpp b/camera/OMXCameraAdapter/OMXCapture.cpp
index 379cf48..68111b8 100644
--- a/camera/OMXCameraAdapter/OMXCapture.cpp
+++ b/camera/OMXCameraAdapter/OMXCapture.cpp
@@ -915,7 +915,7 @@ status_t OMXCameraAdapter::stopImageCapture()
stopFaceDetection();
//Wait here for the capture to be done, in worst case timeout and proceed with cleanup
- ret = mCaptureSem.WaitTimeout(OMX_CAPTURE_TIMEOUT);
+ mCaptureSem.WaitTimeout(OMX_CAPTURE_TIMEOUT);
//If somethiing bad happened while we wait
if (mComponentState == OMX_StateInvalid)
@@ -924,16 +924,6 @@ status_t OMXCameraAdapter::stopImageCapture()
goto EXIT;
}
- if ( NO_ERROR != ret ) {
- ret |= RemoveEvent(mCameraAdapterParameters.mHandleComp,
- (OMX_EVENTTYPE) OMX_EventIndexSettingChanged,
- OMX_ALL,
- OMX_TI_IndexConfigShutterCallback,
- NULL);
- CAMHAL_LOGEA("Timeout expired on capture sem");
- goto EXIT;
- }
-
// Disable image capture
// Capturing command is not needed when capturing in video mode
if (mCapMode != VIDEO_MODE) {