camera: fix CONFIG_SENSOR_01 memory alloc error and ov5640 preview framerate turn...

diff --git a/arch/arm/plat-rk/rk_camera.c b/arch/arm/plat-rk/rk_camera.c
index 0fbdd93267716eb1d554afe4ad76500bc74d316d..8c02cbec78554889ac4d467f5542f468dbc76097 100755 (executable)
--- a/arch/arm/plat-rk/rk_camera.c
+++ b/arch/arm/plat-rk/rk_camera.c
@@ -65,7 +65,7 @@
 \r
 #ifdef CONFIG_SENSOR_IIC_ADDR_01\r
 #if (CONFIG_SENSOR_IIC_ADDR_01 != 0x00)\r
-#define PMEM_SENSOR_FULL_RESOLUTION_01  CONS(CONFIG_SENSOR_02,_FULL_RESOLUTION)\r
+#define PMEM_SENSOR_FULL_RESOLUTION_01  CONS(CONFIG_SENSOR_01,_FULL_RESOLUTION)\r
 \r
     #ifdef CONFIG_SENSOR_CIF_INDEX_01\r
     #define SENSOR_CIF_BUSID_01             CONS(RK_CAM_PLATFORM_DEV_ID_,CONFIG_SENSOR_CIF_INDEX_01)\r

diff --git a/drivers/media/video/ov5640.c b/drivers/media/video/ov5640.c
index 8bdbac5314a79b9121a88812a8abe86fc9d3b724..122762f45a6ec02dcda67f82be45f4ef0477734f 100755 (executable)
--- a/drivers/media/video/ov5640.c
+++ b/drivers/media/video/ov5640.c
@@ -204,7 +204,7 @@ static struct reginfo sensor_init_data[] =
        {0x3034, 0x1a},
        {0x3035, 0x21},
        {0x3036, 0x46},
-       {0x3037, 0x13},
+       {0x3037, 0x03},
        {0x3108, 0x01},
        {0x3630, 0x36},
        {0x3631, 0x0e},