aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Jiang <sam.andrew.jiang@gmail.com>2015-01-04 15:34:16 +0100
committerDaniel Hillenbrand <codeworkx@cyanogenmod.org>2015-01-04 15:34:16 +0100
commit000e1262e965cdf1bf65a335160e64096fb0d5b5 (patch)
treef01e7fb0eded3fb899ecb1efb2522a37e19e0c33
parentf67fec7384380943d97b9a5f2187e7e61bb17451 (diff)
downloaddevice_samsung_espresso3g-000e1262e965cdf1bf65a335160e64096fb0d5b5.zip
device_samsung_espresso3g-000e1262e965cdf1bf65a335160e64096fb0d5b5.tar.gz
device_samsung_espresso3g-000e1262e965cdf1bf65a335160e64096fb0d5b5.tar.bz2
p51xx: camera: get module by class
Change-Id: I75854ad14a51dedfe3c394d32e1afe2866385d74
-rw-r--r--BoardConfigCommon.mk3
-rw-r--r--camerawrapper/CameraWrapper.cpp2
2 files changed, 1 insertions, 4 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 4cb25ba..c96fcd5 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -52,9 +52,6 @@ USE_OPENGL_RENDERER := true
TARGET_BOOTANIMATION_PRELOAD := true
TARGET_BOOTANIMATION_USE_RGB565 := true
-# Camera
-COMMON_GLOBAL_CFLAGS += -DDISABLE_HW_ID_MATCH_CHECK
-
# Vold
BOARD_VOLD_MAX_PARTITIONS := 12
BOARD_VOLD_EMMC_SHARES_DEV_MAJOR := true
diff --git a/camerawrapper/CameraWrapper.cpp b/camerawrapper/CameraWrapper.cpp
index e15bae9..7a13301 100644
--- a/camerawrapper/CameraWrapper.cpp
+++ b/camerawrapper/CameraWrapper.cpp
@@ -89,7 +89,7 @@ static int check_vendor_module()
if(gVendorModule)
return 0;
- rv = hw_get_module("vendor-camera", (const hw_module_t **)&gVendorModule);
+ rv = hw_get_module_by_class("camera", "vendor", (const hw_module_t **)&gVendorModule);
if (rv)
ALOGE("failed to open vendor camera module");
return rv;