summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAkwasi Boateng <akwasi.boateng@ti.com>2011-10-13 16:34:50 +0300
committerIliyan Malchev <malchev@google.com>2011-12-01 10:40:03 -0800
commit5b4aa4034b29df55df71f7bd4901f893db8be906 (patch)
treeb1e431e8741a8dd4e36638068963ad620868d5e0
parenta2e35e983bc41971fbbd79779c270c25bac21faa (diff)
downloadhardware_ti_omap4-5b4aa4034b29df55df71f7bd4901f893db8be906.zip
hardware_ti_omap4-5b4aa4034b29df55df71f7bd4901f893db8be906.tar.gz
hardware_ti_omap4-5b4aa4034b29df55df71f7bd4901f893db8be906.tar.bz2
CameraHAL: Small fix in FD error handling
- 'detectFaces()' should return immediately if there is a mismatch in the 'platformPrivate' size. Signed-off-by: Emilian Peev <epeev@mm-sol.com> Signed-off-by: Vicky Martinez-DeFrain <a0869710@ti.com> Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com> Signed-off-by: Iliyan Malchev <malchev@google.com> Change-Id: Ib4237acdec7fa08dd4b06529e358003783dccf0a
-rw-r--r--camera/OMXCameraAdapter/OMXFD.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/OMXCameraAdapter/OMXFD.cpp b/camera/OMXCameraAdapter/OMXFD.cpp
index 938ccf6..dbebe79 100644
--- a/camera/OMXCameraAdapter/OMXFD.cpp
+++ b/camera/OMXCameraAdapter/OMXFD.cpp
@@ -231,7 +231,7 @@ status_t OMXCameraAdapter::detectFaces(OMX_BUFFERHEADERTYPE* pBuffHeader,
CAMHAL_LOGEB("OMX_TI_PLATFORMPRIVATE size mismatch: expected = %d, received = %d",
( unsigned int ) sizeof(OMX_TI_PLATFORMPRIVATE),
( unsigned int ) platformPrivate->nSize);
- ret = -EINVAL;
+ return -EINVAL;
}
} else {
CAMHAL_LOGEA("Invalid OMX_TI_PLATFORMPRIVATE");