diff options
| author | Tyler Luu <tluu@ti.com> | 2012-05-11 16:10:40 -0500 |
|---|---|---|
| committer | Daniel Levin <dendy@ti.com> | 2012-07-25 08:56:15 -0500 |
| commit | b632489babc36ceeec5d7febb8be7e36537adc3e (patch) | |
| tree | a505d9d5f056c82199178a69482981c47338e495 /camera/CameraHal_Module.cpp | |
| parent | cb4233c5feac2873e2880d7b455faecc05e6aaf5 (diff) | |
| parent | a45d456ec67bcefac80bd978bf825ab82ff1875c (diff) | |
| download | hardware_ti_omap4-b632489babc36ceeec5d7febb8be7e36537adc3e.tar.gz hardware_ti_omap4-b632489babc36ceeec5d7febb8be7e36537adc3e.tar.bz2 hardware_ti_omap4-b632489babc36ceeec5d7febb8be7e36537adc3e.zip | |
Merge branch 'DEV_DB34' into cpcam/latest
Conflicts:
camera/Android.mk
camera/CameraHal.cpp
camera/OMXCameraAdapter/OMXCameraAdapter.cpp
camera/OMXCameraAdapter/OMXCapabilities.cpp
camera/OMXCameraAdapter/OMXCapture.cpp
camera/TICameraParameters.cpp
camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
camera/inc/TICameraParameters.h
Change-Id: I1db68ca97a851ae9c839eb35c3f732657759533c
Diffstat (limited to 'camera/CameraHal_Module.cpp')
| -rw-r--r-- | camera/CameraHal_Module.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/camera/CameraHal_Module.cpp b/camera/CameraHal_Module.cpp index 91baca6..b94b9d6 100644 --- a/camera/CameraHal_Module.cpp +++ b/camera/CameraHal_Module.cpp @@ -707,7 +707,8 @@ int camera_get_camera_info(int camera_id, struct camera_info *info) if(gCameraProperties.initialize() != android::NO_ERROR) { CAMHAL_LOGEA("Unable to create or initialize CameraProperties"); - return NULL; + rv = -EINVAL; + goto end; } //Get camera properties for camera index |