summaryrefslogtreecommitdiffstats
path: root/camera/V4LCameraAdapter/V4LCameraAdapter.cpp
diff options
context:
space:
mode:
authorSergio Aguirre <saaguirre@ti.com>2012-06-06 01:48:17 -0500
committerDaniel Levin <dendy@ti.com>2012-07-25 08:56:44 -0500
commit88838752b04ba707f90bae2365b1910b5f2e5fda (patch)
tree4b4cba55c2d36c955abaf0a5a51f95a19194dbef /camera/V4LCameraAdapter/V4LCameraAdapter.cpp
parent8bae9523b8df3d3a65d2fea0c9ec4f3afd9b9bc0 (diff)
downloadhardware_ti_omap4-88838752b04ba707f90bae2365b1910b5f2e5fda.tar.gz
hardware_ti_omap4-88838752b04ba707f90bae2365b1910b5f2e5fda.tar.bz2
hardware_ti_omap4-88838752b04ba707f90bae2365b1910b5f2e5fda.zip
CameraHAL: V4LCameraAdapter: Catch getCaps error properly
Change-Id: Iada3006b091a297505903063319077f0f5b9662e Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
Diffstat (limited to 'camera/V4LCameraAdapter/V4LCameraAdapter.cpp')
-rw-r--r--camera/V4LCameraAdapter/V4LCameraAdapter.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/camera/V4LCameraAdapter/V4LCameraAdapter.cpp b/camera/V4LCameraAdapter/V4LCameraAdapter.cpp
index 52407af..21ed859 100644
--- a/camera/V4LCameraAdapter/V4LCameraAdapter.cpp
+++ b/camera/V4LCameraAdapter/V4LCameraAdapter.cpp
@@ -1205,7 +1205,12 @@ extern "C" status_t V4LCameraAdapter_Capabilities(
properties = properties_array + starting_camera + num_cameras_supported;
//fetch capabilities for this camera
- V4LCameraAdapter::getCaps( sensorId, properties, tempHandle );
+ ret = V4LCameraAdapter::getCaps( sensorId, properties, tempHandle );
+ if (ret < 0) {
+ CAMHAL_LOGEA("Error while getting capabilities.");
+ close(tempHandle);
+ continue;
+ }
num_cameras_supported++;